diff --git a/ChangeLog b/ChangeLog
index d99b41e05c7e873cb60ae408c21d264e1e916496..5b312d1a812f53932571118ac228e8725a05401e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-25	Benedikt Meurer <benny@xfce.org>
+
+	* thunar-vfs/thunar-vfs-info.c, thunar-vfs/thunar-vfs-xfer.c: Apply
+	  patch provided by Daichi to add several translator hints to
+	  thunar-vfs.
+	* thunar/thunar-properties-dialog.c
+	  (thunar_properties_dialog_key_press_event): Support Ctrl+W for clo-
+	  sing the properties dialog, to be consistent with the main windows.
+
 2006-01-25	Benedikt Meurer <benny@xfce.org>
 
 	* THANKS, configure.in.in: Add nl to XDT_I18N(). Add translator credits
diff --git a/thunar-vfs/thunar-vfs-info.c b/thunar-vfs/thunar-vfs-info.c
index 819614028ece9607f6057028538cabcf67de14dc..0d122b6a1a0efa5f56286cabb31ca1699aba5972 100644
--- a/thunar-vfs/thunar-vfs-info.c
+++ b/thunar-vfs/thunar-vfs-info.c
@@ -258,6 +258,7 @@ thunar_vfs_info_execute (const ThunarVfsInfo *info,
             }
           else
             {
+              /* TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is. */
               g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("No Exec field specified"));
             }
 
@@ -612,6 +613,7 @@ _thunar_vfs_info_new_internal (ThunarVfsPath *path,
   if (G_UNLIKELY (lstat (absolute_path, &lsb) < 0))
     {
       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   /* TRANSLATORS: See man page of stat(1) or stat(2) for more details. */
                    _("Failed to stat file `%s': %s"),
                    absolute_path, g_strerror (errno));
       return NULL;
diff --git a/thunar-vfs/thunar-vfs-xfer.c b/thunar-vfs/thunar-vfs-xfer.c
index 613b389b163f4949a36b4200a309d16ae473569e..b07704993e7f63d812c5706f253e03a733bde2f8 100644
--- a/thunar-vfs/thunar-vfs-xfer.c
+++ b/thunar-vfs/thunar-vfs-xfer.c
@@ -283,6 +283,7 @@ thunar_vfs_xfer_copy_fifo (const gchar          *source_absolute_path,
   /* try to create the named fifo */
   if (mkfifo (target_absolute_path, source_statb->st_mode) < 0)
     {
+      /* TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'. */
       tvxc_set_error_from_errno (error, _("Failed to create named fifo `%s'"), target_absolute_path);
       return FALSE;
     }
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index 7e670e59be75d3f3ef3f477c6ce8fa1826ce4778..22f8e1ddcddf3c0f9256a0e99260eb141ed572de 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -484,7 +484,7 @@ static gboolean
 thunar_properties_dialog_key_press_event (GtkWidget   *widget,
                                           GdkEventKey *event)
 {
-  if (event->keyval == GDK_Escape)
+  if (event->keyval == GDK_Escape || ((event->keyval == GDK_w || event->keyval == GDK_W) && (event->state & GDK_CONTROL_MASK) != 0))
     {
       gtk_widget_destroy (widget);
       return TRUE;