diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
index 00979a1..541dafe 100644
--- a/daemon/gvfsbackendgphoto2.c
+++ b/daemon/gvfsbackendgphoto2.c
@@ -2745,7 +2745,7 @@ do_set_display_name (GVfsBackend *backend,
       rc = do_dir_rename_in_same_dir (gphoto2_backend, dir, name, display_name);
       if (rc != 0)
         {
-          error = get_error_from_gphoto2 (_("Error renaming dir"), rc);
+          error = get_error_from_gphoto2 (_("Error renaming directory"), rc);
           g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
           g_error_free (error);
           goto out;
@@ -3332,7 +3332,7 @@ do_move (GVfsBackend *backend,
           DEBUG ("  not supported (src is dir; dst is dir)");
           g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
                             G_IO_ERROR_NOT_SUPPORTED,
-                            _("Not supported (src is dir, dst is dir)"));
+                            _("Not supported (the source is a directory, the destination is a directory too)"));
           goto out;
         }
       else if (is_regular (gphoto2_backend, dst_dir, dst_name))
@@ -3340,7 +3340,7 @@ do_move (GVfsBackend *backend,
           DEBUG ("  not supported (src is dir; dst is existing file)");
           g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
                             G_IO_ERROR_NOT_SUPPORTED,
-                            _("Not supported (src is dir, dst is existing file)"));
+                            _("Not supported (the source is a directory, but the destination is an existing file)"));
           goto out;
         }
       mv_dir = TRUE;
@@ -3352,7 +3352,7 @@ do_move (GVfsBackend *backend,
           DEBUG ("  not supported (src is file; dst is dir)");
           g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
                             G_IO_ERROR_NOT_SUPPORTED,
-                            _("Not supported (src is file, dst is dir)"));
+                            _("Not supported (the source is a file, but the destination is a directory)"));
           goto out;
         }
     }
@@ -3375,7 +3375,7 @@ do_move (GVfsBackend *backend,
       if (rc != 0)
         {
           DEBUG ("  error renaming dir");
-          error = get_error_from_gphoto2 (_("Error renaming dir"), rc);
+          error = get_error_from_gphoto2 (_("Error renaming directory"), rc);
           g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
           g_error_free (error);
           goto out;
diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c
index 13f77c7..f03d4b2 100644
--- a/daemon/gvfsdaemonutils.c
+++ b/daemon/gvfsdaemonutils.c
@@ -101,7 +101,7 @@ dbus_connection_send_fd (DBusConnection *connection,
 
       g_set_error (error, G_IO_ERROR,
 		   g_io_error_from_errno (errsv),
-		   _("Error sending fd: %s"),
+		   _("Error sending file descriptor: %s"),
 		   g_strerror (errsv));
       g_static_mutex_unlock (&extra_lock);
       return FALSE;
diff --git a/programs/gvfs-tree.c b/programs/gvfs-tree.c
index 652fa70..f235df5 100644
--- a/programs/gvfs-tree.c
+++ b/programs/gvfs-tree.c
@@ -34,7 +34,7 @@ static gboolean follow_symlinks = FALSE;
 static GOptionEntry entries[] =
 {
   { "hidden", 'h', 0, G_OPTION_ARG_NONE, &show_hidden, N_("Show hidden files"), NULL },
-  { "follow-symlinks", 'l', 0, G_OPTION_ARG_NONE, &follow_symlinks, N_("Follow symlinks, mounts and shortcuts like dirs"), NULL },
+  { "follow-symlinks", 'l', 0, G_OPTION_ARG_NONE, &follow_symlinks, N_("Follow symbolic links, mounts and shortcuts like directories"), NULL },
 };
 
 static gint
