Ondrej Holy · Zurab Kargareteli · Asier Sarasua Garmendia · Ondrej Holy · Марко Костић · Bastien Nocera
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,18 @@ fedora:
        - x86_64
        - ipv6
    script:
-        - meson -Dinstalled_tests=true -Ddevel_utils=true -Dman=true -Dafc=true --prefix /usr --werror build
+        - meson
+          -Dinstalled_tests=true
+          -Ddevel_utils=true
+          -Dman=true
+          -Dafc=true
+          -Darchive=true
+          -Dsftp=true
+          -Dsmb=true
+          -Dudisks2=true
+          -Dhttp=true
+          -Dgphoto2=true
+          --prefix /usr --werror build
        - sudo ninja -C build install
        - GIO_USE_VOLUME_MONITOR=unix gnome-desktop-testing-runner gvfs
    allow_failure: true

--- a/NEWS
+++ b/NEWS
+Major changes in 1.50.3
+=======================
+* dav: Prevent usage of NULL when user is not specified (Ondrej Holy)
+* ftp: Fix hangs when the connection is released (wangrong)
+* fuse: Decrease file handle reference when open file fail (wangrong)
+* sftp: PATH-expand the ssh client (Alex Stewart)
+* test: Several smaller enhancements (Sébastien Bacher)
+* backend: Add support for xx-large and x-large thumbnails (Ondrej Holy)
+* goa: Prevent automounts when resuming from suspension (Ondrej Holy)
+* Translation updates (GNOME Translation Project contributors)
+
 Major changes in 1.50.2
 =======================
 * smb: Rework anonymous handling to avoid EINVAL (Ondrej Holy)

--- a/README.md
+++ b/README.md
@@ -19,6 +19,4 @@ logs.

 ## Ask Questions

-For questions use gvfs mailing list [gvfs-list@gnome.org](mailto:gvfs-list@gnome.org).
-See https://mail.gnome.org/mailman/listinfo/gvfs-list for subscription info.
-Alternatively, irc://irc.gnome.org/nautilus can be used.
+For questions use [GNOME Discourse](https://discourse.gnome.org/).
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -1091,6 +1091,9 @@ open_common (const gchar *path, struct fuse_file_info *fi, GFile *file, int outp

  g_mutex_unlock (&fh->mutex);

+  if (result < 0)
+    file_handle_unref (fh);
+
  /* The added reference to the file handle is released in vfs_release() */
  return result;
 }

--- a/daemon/gvfsbackend.c
+++ b/daemon/gvfsbackend.c
@@ -524,6 +524,8 @@ get_thumbnail_attributes (const char *uri,
  GChecksum *checksum;
  char *filename;
  char *basename;
+  const char *size_dirs[4] = { "xx-large", "x-large", "large", "normal" };
+  gsize i;

  checksum = g_checksum_new (G_CHECKSUM_MD5);
  g_checksum_update (checksum, (const guchar *) uri, strlen (uri));
@@ -531,34 +533,31 @@ get_thumbnail_attributes (const char *uri,
  basename = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
  g_checksum_free (checksum);

-  filename = g_build_filename (g_get_user_cache_dir (),
-                               "thumbnails", "large", basename,
-                               NULL);
+  for (i = 0; i < G_N_ELEMENTS (size_dirs); i++)
+    {
+      filename = g_build_filename (g_get_user_cache_dir (),
+                                   "thumbnails", size_dirs[i], basename,
+                                   NULL);
+      if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
+        break;

-  if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
+      g_clear_pointer (&filename, g_free);
+    }
+
+  if (filename)
    g_file_info_set_attribute_byte_string (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH, filename);
  else
    {
-      g_free (filename);
      filename = g_build_filename (g_get_user_cache_dir (),
-                                   "thumbnails", "normal", basename,
+                                   "thumbnails", "fail",
+                                   "gnome-thumbnail-factory",
+                                   basename,
                                   NULL);

      if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
-        g_file_info_set_attribute_byte_string (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH, filename);
-      else
-        {
-          g_free (filename);
-          filename = g_build_filename (g_get_user_cache_dir (),
-                                       "thumbnails", "fail",
-                                       "gnome-thumbnail-factory",
-                                       basename,
-                                       NULL);
-
-          if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
-            g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED, TRUE);
-        }
+        g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED, TRUE);
    }
+
  g_free (basename);
  g_free (filename);
 }

--- a/daemon/gvfsbackenddav.c
+++ b/daemon/gvfsbackenddav.c
@@ -2046,6 +2046,7 @@ mount_success (GVfsBackend *backend, GVfsJobMount *job)
  GVfsBackendHttp *http_backend = G_VFS_BACKEND_HTTP (backend);
  GMountSpec *mount_spec;
  GUri *tmp;
+  const gchar *user;

  /* Save the auth info in the keyring */
  keyring_save_authinfo (&(dav_backend->auth_info.server_auth), http_backend->mount_base, FALSE);
@@ -2067,8 +2068,9 @@ mount_success (GVfsBackend *backend, GVfsJobMount *job)
   * So it has to be restored here in order to avoid:
   * https://gitlab.gnome.org/GNOME/gvfs/-/issues/614
   */
-  g_mount_spec_set (mount_spec, "user",
-                    g_mount_spec_get (job->mount_spec, "user"));
+  user = g_mount_spec_get (job->mount_spec, "user");
+  if (user != NULL)
+    g_mount_spec_set (mount_spec, "user", user);

  g_vfs_backend_set_mount_spec (backend, mount_spec);
  g_vfs_backend_set_icon_name (backend, "folder-remote");

--- a/daemon/gvfsftptask.c
+++ b/daemon/gvfsftptask.c
@@ -231,6 +231,7 @@ g_vfs_ftp_task_acquire_connection (GVfsFtpTask *task)
          if (g_vfs_ftp_connection_is_usable (task->conn))
            break;

+          ftp->connections--;
          g_vfs_ftp_connection_free (task->conn);
          task->conn = NULL;
        }

--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -256,7 +256,7 @@ if enable_sftp
    '-DDEFAULT_BACKEND_TYPE=sftp',
    '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,',
    '-DMAX_JOB_THREADS=1',
-    '-DSSH_PROGRAM="@0@"'.format(ssh.full_path()),
+    '-DSSH_PROGRAM="ssh"',
  ]

  programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}}

--- a/gvfs.doap
+++ b/gvfs.doap
@@ -10,7 +10,7 @@
  <description xml:lang="en">GVfs is a userspace virtual filesystem implementation for GIO (a library available in GLib). GVfs comes with a set of backends, including trash support, SFTP, SMB, HTTP, DAV, and many others. GVfs also contains modules for GIO that implement volume monitors and persistent metadata storage. There is also FUSE support that provides limited access to the GVfs filesystems for applications not using GIO.</description>

  <homepage rdf:resource="https://wiki.gnome.org/Projects/gvfs" />
-  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gvfs-list" />
+  <mailing-list rdf:resource="https://discourse.gnome.org" />
  <download-page rdf:resource="http://download.gnome.org/sources/gvfs/" />
  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gvfs/issues/" />
  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />

--- a/meson.build
+++ b/meson.build
 project(
  'gvfs', 'c',
-  version: '1.50.2',
+  version: '1.50.3',
  license: 'LGPL2+',
  default_options: 'buildtype=debugoptimized',
  meson_version: '>= 0.56.0',
@@ -457,10 +457,6 @@ endif

 # *** SFTP backend ***
 enable_sftp = get_option('sftp')
-if enable_sftp
-  ssh = find_program('ssh', required: false)
-  assert(ssh.found(), 'SFTP backend requested but a ssh client is required')
-endif

 # *** Enable development utils ***
 enable_devel_utils = get_option('devel_utils')

--- a/monitor/goa/goavolume.c
+++ b/monitor/goa/goavolume.c
@@ -99,8 +99,6 @@ account_attention_needed_cb (GObject *_object, GParamSpec *pspec, gpointer user_
          g_clear_object (&self->mount);
        }
    }
-  else
-    g_volume_mount (G_VOLUME (self), G_MOUNT_MOUNT_NONE, NULL, NULL, NULL, NULL);
 }

 /* ---------------------------------------------------------------------------------------------------- */

--- a/po/LINGUAS
+++ b/po/LINGUAS
 # please keep this list sorted alphabetically
+ab
 af
 ar
 as
@@ -33,8 +34,10 @@ hr
 hu
 hi
 id
+ie
 it
 ja
+ka
 kk
 kn
 ko

--- a/po/ab.po
+++ b/po/ab.po
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,13 +4,13 @@
 #
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2008, 2009, 2010, 2011, 2012.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2013, 2014, 2015, 2016, 2017.
-# Asier Sarasua Garmendia  <asiersarasua@ni.eus>, 2019, 2020, 2021.
+# Asier Sarasua Garmendia  <asiersarasua@ni.eus>, 2019, 2020, 2021, 2022.
 #
 msgid ""
 msgstr "Project-Id-Version: gvfs master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gvfs/issues\n"
-"POT-Creation-Date: 2021-04-23 06:45+0000\n"
-"PO-Revision-Date: 2021-2-20 10:00+0100\n"
+"POT-Creation-Date: 2022-02-02 10:02+0000\n"
+"PO-Revision-Date: 2022-04-03 10:00+0100\n"
 "Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
@@ -117,7 +117,7 @@ msgstr "Errorea muntaiaren informazioa lortzean: %s"
 #: daemon/gvfsafpvolume.c:2402 daemon/gvfsbackendadmin.c:150
 #: daemon/gvfsbackendafc.c:166 daemon/gvfsbackendgoogle.c:256
 #: daemon/gvfsbackendsftp.c:346 daemon/gvfsbackendsftp.c:1125
-#: daemon/gvfsbackendsftp.c:2215 daemon/gvfsftptask.c:437
+#: daemon/gvfsbackendsftp.c:2215 daemon/gvfsftptask.c:437 daemon/mount.c:437
 #, c-format
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
@@ -390,8 +390,8 @@ msgstr "Fitxategia ez da existitzen"

 #: daemon/gvfsafpvolume.c:402 daemon/gvfsafpvolume.c:2410
 #: daemon/gvfsbackendafp.c:289 daemon/gvfsbackendafp.c:492
-#: daemon/gvfsbackendafp.c:1341 daemon/gvfsbackenddav.c:2410
-#: daemon/gvfsbackenddav.c:3073 daemon/gvfsbackenddav.c:3353
+#: daemon/gvfsbackendafp.c:1341 daemon/gvfsbackenddav.c:2558
+#: daemon/gvfsbackenddav.c:3320 daemon/gvfsbackenddav.c:3524
 #: daemon/gvfsbackendftp.c:832 daemon/gvfsbackendnfs.c:2480
 #: daemon/gvfsbackendsftp.c:2725 daemon/gvfsbackendsftp.c:3500
 #: daemon/gvfsbackendsftp.c:3948 daemon/gvfsbackendsftp.c:5020
@@ -408,7 +408,7 @@ msgid "Target file is open"
 msgstr "Helburuko fitxategia irekita dago"

 #: daemon/gvfsafpvolume.c:663 daemon/gvfsbackendafc.c:154
-#: daemon/gvfsbackendburn.c:421 daemon/gvfsbackenddav.c:2800
+#: daemon/gvfsbackendburn.c:421 daemon/gvfsbackenddav.c:3012
 #: daemon/gvfsbackendgoogle.c:2497 daemon/gvfsbackendsftp.c:2209
 msgid "Directory not empty"
 msgstr "Direktorioa ez dago hutsik"
@@ -437,10 +437,10 @@ msgstr "Ez dago nahikoa leku librerik bolumenean"

 #: daemon/gvfsafpvolume.c:811 daemon/gvfsafpvolume.c:1355
 #: daemon/gvfsafpvolume.c:1507 daemon/gvfsbackendafp.c:296
-#: daemon/gvfsbackendafp.c:499 daemon/gvfsbackenddav.c:2465
-#: daemon/gvfsbackenddav.c:2761 daemon/gvfsbackenddav.c:2869
-#: daemon/gvfsbackenddav.c:3006 daemon/gvfsbackenddav.c:3082
-#: daemon/gvfsbackenddav.c:3120 daemon/gvfsbackenddav.c:3344
+#: daemon/gvfsbackendafp.c:499 daemon/gvfsbackenddav.c:2626
+#: daemon/gvfsbackenddav.c:2974 daemon/gvfsbackenddav.c:3099
+#: daemon/gvfsbackenddav.c:3251 daemon/gvfsbackenddav.c:3329
+#: daemon/gvfsbackenddav.c:3373 daemon/gvfsbackenddav.c:3514
 #: daemon/gvfsbackendftp.c:811 daemon/gvfsbackendftp.c:999
 #: daemon/gvfsbackendftp.c:1509 daemon/gvfsbackendftp.c:1576
 #: daemon/gvfsbackendgoogle.c:1703 daemon/gvfsbackendgoogle.c:1780
@@ -550,8 +550,8 @@ msgstr "Fitxategia ez da irakurtzeko atzipenarekin ireki"
 #: daemon/gvfsbackendadmin.c:104 daemon/gvfsbackendadmin.c:871
 #: daemon/gvfsbackendafc.c:2361 daemon/gvfsbackendafp.c:1781
 #: daemon/gvfsbackendburn.c:829 daemon/gvfsbackendburn.c:951
-#: daemon/gvfsbackendcomputer.c:812 daemon/gvfsbackenddav.c:3427
-#: daemon/gvfsbackenddav.c:3459 daemon/gvfsbackenddav.c:3487
+#: daemon/gvfsbackendcomputer.c:812 daemon/gvfsbackenddav.c:3599
+#: daemon/gvfsbackenddav.c:3631 daemon/gvfsbackenddav.c:3659
 #: daemon/gvfsbackendftp.c:1209 daemon/gvfsbackendftp.c:1257
 #: daemon/gvfsbackendftp.c:1278 daemon/gvfsbackendftp.c:1624
 #: daemon/gvfsbackendgoogle.c:1590 daemon/gvfsbackendgoogle.c:1623
@@ -605,8 +605,8 @@ msgid "Operation not supported"
 msgstr "Eragiketa ez dago onartuta"

 #: daemon/gvfsbackendadmin.c:999 daemon/gvfsbackendarchive.c:639
-#: daemon/gvfsbackendarchive.c:668 daemon/gvfsbackenddav.c:1903
-#: daemon/gvfsbackendgoogle.c:2943 daemon/gvfsbackendhttp.c:256
+#: daemon/gvfsbackendarchive.c:668 daemon/gvfsbackenddav.c:2009
+#: daemon/gvfsbackendgoogle.c:2943 daemon/gvfsbackendhttp.c:303
 #: daemon/gvfsbackendsmb.c:596
 msgid "Invalid mount spec"
 msgstr "Muntaiaren zehaztapen baliogabea"
@@ -765,7 +765,7 @@ msgstr "Ezin da direktorioa ireki"

 #: daemon/gvfsbackendafc.c:1273 daemon/gvfsbackendafc.c:2528
 #: daemon/gvfsbackendafp.c:1270 daemon/gvfsbackendafp.c:1359
-#: daemon/gvfsbackenddav.c:2905 daemon/gvfsbackendftp.c:1461
+#: daemon/gvfsbackenddav.c:3139 daemon/gvfsbackendftp.c:1461
 #: daemon/gvfsbackendsftp.c:3722 daemon/gvfsbackendsftp.c:4009
 msgid "Backups not supported"
 msgstr "Babeskopiak ez daude onartuta"
@@ -819,21 +819,21 @@ msgid "Apple Filing Protocol Service"
 msgstr "'Apple Filing Protocol' zerbitzua"

 #: daemon/gvfsbackendafp.c:286 daemon/gvfsbackendburn.c:877
-#: daemon/gvfsbackenddav.c:3068 daemon/gvfsbackendftp.c:1568
+#: daemon/gvfsbackenddav.c:3315 daemon/gvfsbackendftp.c:1568
 #: daemon/gvfsbackendgoogle.c:1752 daemon/gvfsbackendgoogle.c:2095
 #: daemon/gvfsbackendgoogle.c:3141
 msgid "Can’t copy directory over directory"
 msgstr "Ezin da direktorioa kopiatu direktorio gainean"

 #: daemon/gvfsbackendafp.c:305 daemon/gvfsbackendburn.c:893
-#: daemon/gvfsbackenddav.c:3097 daemon/gvfsbackendftp.c:1591
+#: daemon/gvfsbackenddav.c:3344 daemon/gvfsbackendftp.c:1591
 #: daemon/gvfsbackendgoogle.c:1814 daemon/gvfsbackendgoogle.c:3168
 #: daemon/gvfsbackendgoogle.c:3216 daemon/gvfsbackendmtp.c:1641
 #: daemon/gvfsbackendmtp.c:1656
 msgid "Can’t recursively copy directory"
 msgstr "Ezin da direktorioa errekurtsiboki kopiatu"

-#: daemon/gvfsbackendafp.c:489 daemon/gvfsbackenddav.c:2945
+#: daemon/gvfsbackendafp.c:489 daemon/gvfsbackenddav.c:3179
 #: daemon/gvfsbackendgoogle.c:2209 daemon/gvfsbackendnfs.c:2474
 #: daemon/gvfsbackendsftp.c:5015 daemon/gvfsbackendsmb.c:2100
 msgid "Can’t move directory over directory"
@@ -844,7 +844,7 @@ msgstr "Ezin da direktorioa lekuz aldatu direktorioaren gainera"
 msgid "Unable to create temporary file (%s)"
 msgstr "Ezin da aldi baterako fitxategia sortu (%s)"

-#: daemon/gvfsbackendafp.c:1348 daemon/gvfsbackenddav.c:2546
+#: daemon/gvfsbackendafp.c:1348 daemon/gvfsbackenddav.c:2729
 #: daemon/gvfsbackendnfs.c:1177 daemon/gvfsbackendsftp.c:3963
 #: daemon/gvfsbackendsmb.c:1091
 msgid "The file was externally modified"
@@ -924,7 +924,7 @@ msgstr "CD/DVD sortzailea"
 msgid "File exists"
 msgstr "Fitxategia badago lehendik ere"

-#: daemon/gvfsbackendburn.c:886 daemon/gvfsbackenddav.c:2983
+#: daemon/gvfsbackendburn.c:886 daemon/gvfsbackenddav.c:3223
 #: daemon/gvfsbackendsftp.c:2211 daemon/gvfsbackendsftp.c:5195
 msgid "Target file exists"
 msgstr "Helburuko fitxategia existitzen da"
@@ -1062,41 +1062,41 @@ msgstr "Ezin da fitxategia kontsultatu"
 #. Translators: This is the name of the WebDAV share constructed as
 #. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
 #. the second %s and only shown if it is not the default http(s) port.
-#: daemon/gvfsbackenddav.c:503
+#: daemon/gvfsbackenddav.c:539
 #, c-format
 msgid "%s on %s%s"
 msgstr "%s - %s%s"

-#: daemon/gvfsbackenddav.c:708 daemon/gvfsbackenddav.c:2078
-#: daemon/gvfsbackendhttp.c:202
+#: daemon/gvfsbackenddav.c:753 daemon/gvfsbackenddav.c:2197
+#: daemon/gvfsbackendhttp.c:268 daemon/gvfshttpinputstream.c:273
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP errorea: %s"

-#: daemon/gvfsbackenddav.c:725
+#: daemon/gvfsbackenddav.c:768
 msgid "Could not parse response"
 msgstr "Ezin izan da erantzuna aztertu"

-#: daemon/gvfsbackenddav.c:734
+#: daemon/gvfsbackenddav.c:777
 msgid "Empty response"
 msgstr "Erantzuna hutsik"

-#: daemon/gvfsbackenddav.c:742
+#: daemon/gvfsbackenddav.c:785
 msgid "Unexpected reply from server"
 msgstr "Ustekabeko erantzuna zerbitzaritik"

-#: daemon/gvfsbackenddav.c:1444 daemon/gvfsbackenddav.c:2205
-#: daemon/gvfsbackenddav.c:2300 daemon/gvfsbackenddav.c:2402
+#: daemon/gvfsbackenddav.c:1529 daemon/gvfsbackenddav.c:2327
+#: daemon/gvfsbackenddav.c:2425 daemon/gvfsbackenddav.c:2550
 msgid "Response invalid"
 msgstr "Erantzun baliogabea"

-#: daemon/gvfsbackenddav.c:1588
+#: daemon/gvfsbackenddav.c:1675
 msgid "WebDAV share"
 msgstr "WebDAV partekatzea"

 #. Translators: %s is the name of the WebDAV share
 #. Translators: %s is a server name
-#: daemon/gvfsbackenddav.c:1591 daemon/gvfsbackendsmbbrowse.c:373
+#: daemon/gvfsbackenddav.c:1678 daemon/gvfsbackendsmbbrowse.c:373
 #, c-format
 msgid ""
 "Authentication Required\n"
@@ -1104,27 +1104,27 @@ msgid ""
 msgstr "Autentifikazioa behar da\n"
 "Sartu “%s”zerbitzariaren pasahitza:"

-#: daemon/gvfsbackenddav.c:1594
+#: daemon/gvfsbackenddav.c:1681
 msgid ""
 "Authentication Required\n"
 "Enter proxy password:"
 msgstr "Autentifikazioa behar da\n"
 "Sartu proxyaren pasahitza:"

-#: daemon/gvfsbackenddav.c:2064
+#: daemon/gvfsbackenddav.c:2186
 msgid "Not a WebDAV enabled share"
 msgstr "Ez da gaitutako WebDAV partekatzea"

-#: daemon/gvfsbackenddav.c:2086
+#: daemon/gvfsbackenddav.c:2206
 msgid "Could not find an enclosing directory"
 msgstr "Ezin izan da direktorio inguratu bat aurkitu"

-#: daemon/gvfsbackenddav.c:2159 daemon/gvfsbackenddav.c:2255
-#: daemon/gvfsbackenddav.c:2328 daemon/gvfsbackenddav.c:2436
+#: daemon/gvfsbackenddav.c:2283 daemon/gvfsbackenddav.c:2382
+#: daemon/gvfsbackenddav.c:2456 daemon/gvfsbackenddav.c:2584
 msgid "Could not create request"
 msgstr "Ezin izan da eskaera sortu"

-#: daemon/gvfsbackenddav.c:2577 daemon/gvfsbackendftp.c:1102
+#: daemon/gvfsbackenddav.c:2763 daemon/gvfsbackendftp.c:1102
 #: daemon/gvfsbackendgoogle.c:3944 daemon/gvfsbackendnfs.c:941
 #: daemon/gvfsbackendnfs.c:964 daemon/gvfsbackendnfs.c:990
 #: daemon/gvfsbackendnfs.c:1390 daemon/gvfsbackendsmb.c:1127
@@ -1132,14 +1132,10 @@ msgstr "Ezin izan da eskaera sortu"
 msgid "Backup file creation failed"
 msgstr "Huts egin du babeskopia sortzean"

-#: daemon/gvfsbackenddav.c:2950
+#: daemon/gvfsbackenddav.c:3184
 msgid "Can’t move over directory"
 msgstr "Ezin da direktorio gainera eraman"

-#: daemon/gvfsbackenddav.c:3219
-msgid "File length changed during transfer"
-msgstr "Fitxategiaren luzera aldatuta transferentzian"
-
 #: daemon/gvfsbackenddnssd.c:521 daemon/gvfsbackendnetwork.c:462
 msgid "Local Network"
 msgstr "Sare lokala"
@@ -1411,7 +1407,7 @@ msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "Ez dago onartuta (iturburukoa fitxategia da, baina helburukoa direktorioa da)"

-#: daemon/gvfsbackendhttp.c:198
+#: daemon/gvfsbackendhttp.c:263
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP bezeroaren errorea: %s"
@@ -1927,7 +1923,7 @@ msgstr "Orrialde mota ezezaguna"
 msgid "Invalid filename"
 msgstr "Fitxategi-izen baliogabea"

-#: daemon/gvfshttpinputstream.c:292
+#: daemon/gvfshttpinputstream.c:289
 msgid "Error seeking in stream"
 msgstr "Errorea korrontean bilatzean"

@@ -1996,24 +1992,24 @@ msgstr "%s: %s"
 msgid "Try “%s --help” for more information."
 msgstr "Saiatu “%s --help” informazio gehiagorako."

-#: daemon/mount.c:759
+#: daemon/mount.c:783
 #, c-format
 msgid "Automount failed: %s"
 msgstr "Huts egin du automatikoki muntatzean: %s"

-#: daemon/mount.c:803 daemon/mount.c:879
+#: daemon/mount.c:827 daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "Zehaztutako kokalekua ez da muntatu"

-#: daemon/mount.c:808
+#: daemon/mount.c:832
 msgid "The specified location is not supported"
 msgstr "Zehaztutako kokalekua ez dago onartuta"

-#: daemon/mount.c:991
+#: daemon/mount.c:1015
 msgid "Location is already mounted"
 msgstr "Kokalekua jadanik muntatuta dago"

-#: daemon/mount.c:1000
+#: daemon/mount.c:1024
 msgid "Location is not mountable"
 msgstr "Kokalekua ez da muntagarria"

@@ -2216,7 +2212,7 @@ msgstr "Desblokeatutako gailuak ez dauka fitxategi-sistema ezagunik"
 #: monitor/udisks2/gvfsudisks2volume.c:1275
 #, c-format
 msgid "Encryption passphrase for %s"
-msgstr "Enkriptazioaren pasaesaldia %s(r)entzako"
+msgstr "Zifratzearen pasaesaldia %s(r)entzako"

 #: monitor/udisks2/gvfsudisks2volume.c:1484
 msgid "A passphrase is required to access the volume"
@@ -2255,6 +2251,9 @@ msgstr "%s (%s)"
 msgid "GVfs UDisks2 Volume Monitor"
 msgstr "GVfs UDisks2 bolumenaren monitorea"

+#~ msgid "File length changed during transfer"
+#~ msgstr "Fitxategiaren luzera aldatuta transferentzian"
+
 #~ msgid "Enter your password for the server “%s”."
 #~ msgstr "Sartu zure pasahitza '%s' zerbitzariarentzako."


--- a/po/fi.po
+++ b/po/fi.po
--- a/po/ie.po
+++ b/po/ie.po
--- a/po/ka.po
+++ b/po/ka.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/tr.po
+++ b/po/tr.po