diff --git a/ChangeLog b/ChangeLog
index 1ecc7a3a463a70e5dac91b93bec7b878a07b5ad2..0d33e65702a89ac83337d8d9615b9ea18a872663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-08-26	Benedikt Meurer <benny@xfce.org>
+
+	* plugins/thunar-uca/thunar-uca-model.c(thunar_uca_model_parse_argv):
+	  Substitute %d properly. Bug #2214.
+	* thunar/thunar-gdk-pixbuf-extensions.{c,h}, thunar/Makefile.am,
+	  thunar/thunar-icon-factory.c, thunar/thunar-icon-renderer.c: Use
+	  exo_gdk_pixbuf_frame() instead of thunar_gdk_pixbuf_frame() and drop
+	  the GdkPixbuf extensions.
+	* thunar-vfs/thunar-vfs-pixbuf-thumbnailer.c, thunar/Makefile.am: Use
+	  exo_gdk_pixbuf_new_from_file_at_max_size() for the pixbuf thumbnai-
+	  ler.
+	* configure.in.in, README, thunar-vfs/thunar-vfs-font-thumbnailer.c,
+	  thunar-vfs/thunar-vfs-update-thumbnailers-cache.c,
+	  thunar-vfs/Makefile.am: Import the font thumbnailer, which uses
+	  freetype 2.x (if available) to generate a thumbnail of a font file.
+	* plugins/thunar-uca/thunar-uca-editor.c: Use ExoIconChooserDialog to
+	  select an icon for a custom action.
+	* po/POTFILES.in: Add new files here.
+	* po/Thunar.pot, po/*.po: Merge new strings.
+	* po/de.po: Update german translations.
+
 2006-08-24	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-renamer-model.c, thunar/thunar-shortcuts-model.c: Fix
diff --git a/README b/README
index 78bb4560020162ea431afc34c381a20d933929b4..ffcd9730fa46a9d62fd68564ee4fc2f3f2d73fe3 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ Thunar depends on the following packages:
 
  - perl 5.6 or above
  - GTK+ 2.6.0 or above
- - libexo 0.3.1.8 or above
+ - libexo 0.3.1.9 or above
  - intltool 0.30 or above
  - libpng12 1.2.0 or above
  - shared-mime-info 0.15 or above
@@ -22,6 +22,7 @@ Thunar can optionally use the following packages:
 
  - D-BUS 0.34 or above (strongly suggested)
  - HAL 0.5.0 or above (esp. the libhal-storage devel package)
+ - freetype 2.0 or above (for the font thumbnailer)
  - gamin 0.1.0 or above
  - gconf 2.4 or above
  - libexif 0.6 or above
diff --git a/configure.in.in b/configure.in.in
index 816a965449fd25b4f8a2b3f5ec962f6693176c29..74d5116f402a7e444aa98dc4d882f06769a6599f 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -186,6 +186,25 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION],
                            [0.4], [startup-notification],
                            [startup notification library])
 
+dnl ******************************
+dnl *** Check for FreeType 2.x ***
+dnl ******************************
+FREETYPE_LIBS=""
+FREETYPE_CFLAGS=""
+AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no])
+if test x"$FREETYPE_CONFIG" != x"no"; then
+  AC_MSG_CHECKING([FREETYPE_CFLAGS])
+  FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
+  AC_MSG_RESULT([$FREETYPE_CFLAGS])
+
+  AC_MSG_CHECKING([FREETYPE_LIBS])
+  FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
+  AC_MSG_RESULT([$FREETYPE_LIBS])
+fi
+AM_CONDITIONAL([HAVE_FREETYPE], [test x"$FREETYPE_CONFIG" != x"no"])
+AC_SUBST([FREETYPE_CFLAGS])
+AC_SUBST([FREETYPE_LIBS])
+
 dnl *************************
 dnl *** Check for libjpeg ***
 dnl *************************
diff --git a/plugins/thunar-uca/thunar-uca-editor.c b/plugins/thunar-uca/thunar-uca-editor.c
index 17dff4b37f9edfde199f282477d437db6166af3b..d7d2ceec6ec25d3e26aee1924193b1e195d7f562 100644
--- a/plugins/thunar-uca/thunar-uca-editor.c
+++ b/plugins/thunar-uca/thunar-uca-editor.c
@@ -29,8 +29,6 @@
 #include <string.h>
 #endif
 
-#include <glib/gi18n-lib.h>
-
 #include <exo/exo.h>
 
 #include <thunar-uca/thunar-uca-editor.h>
@@ -115,6 +113,7 @@ thunar_uca_editor_init (ThunarUcaEditor *uca_editor)
   /* configure the dialog properties */
   gtk_dialog_add_button (GTK_DIALOG (uca_editor), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
   gtk_dialog_add_button (GTK_DIALOG (uca_editor), GTK_STOCK_OK, GTK_RESPONSE_OK);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (uca_editor), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
   gtk_dialog_set_default_response (GTK_DIALOG (uca_editor), GTK_RESPONSE_OK);
   gtk_dialog_set_has_separator (GTK_DIALOG (uca_editor), FALSE);
   gtk_window_set_destroy_with_parent (GTK_WINDOW (uca_editor), TRUE);
@@ -594,96 +593,46 @@ thunar_uca_editor_command_clicked (ThunarUcaEditor *uca_editor)
 
 
 
-static void
-update_preview (GtkFileChooser *chooser,
-                GtkWidget      *image)
-{
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *scaled;
-  gchar     *filename;
-  gint       height;
-  gint       width;
-
-  filename = gtk_file_chooser_get_filename (chooser);
-  pixbuf = (filename != NULL) ? gdk_pixbuf_new_from_file (filename, NULL) : NULL;
-  if (G_LIKELY (pixbuf != NULL))
-    {
-      width = gdk_pixbuf_get_width (pixbuf);
-      height = gdk_pixbuf_get_height (pixbuf);
-      if (G_UNLIKELY (width > 128 || height > 128))
-        {
-          scaled = exo_gdk_pixbuf_scale_ratio (pixbuf, 128);
-          g_object_unref (G_OBJECT (pixbuf));
-          pixbuf = scaled;
-        }
-
-      gtk_file_chooser_set_preview_widget_active (chooser, TRUE);
-      gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-      g_object_unref (G_OBJECT (pixbuf));
-    }
-  else
-    {
-      gtk_file_chooser_set_preview_widget_active (chooser, FALSE);
-    }
-
-  g_free (filename);
-}
-
-
-
 static void
 thunar_uca_editor_icon_clicked (ThunarUcaEditor *uca_editor)
 {
-  GtkFileFilter *filter;
-  GtkWidget     *chooser;
-  GtkWidget     *image;
-  gchar         *filename;
+  const gchar *name;
+  GtkWidget   *chooser;
+  gchar       *title;
+  gchar       *icon;
 
   g_return_if_fail (THUNAR_UCA_IS_EDITOR (uca_editor));
 
-  chooser = gtk_file_chooser_dialog_new (_("Select an Icon"),
-                                         GTK_WINDOW (uca_editor),
-                                         GTK_FILE_CHOOSER_ACTION_OPEN,
+  /* determine the name of the action being edited */
+  name = gtk_entry_get_text (GTK_ENTRY (uca_editor->name_entry));
+  if (G_UNLIKELY (name == NULL || *name == '\0'))
+    name = _("Unknown");
+
+  /* allocate the chooser dialog */
+  title = g_strdup_printf (_("Select an Icon for \"%s\""), name);
+  chooser = exo_icon_chooser_dialog_new (title, GTK_WINDOW (uca_editor),
                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                         GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                         GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
                                          NULL);
-  gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), TRUE);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
+  gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
+  g_free (title);
 
-  /* add file chooser filters */
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("All Files"));
-  gtk_file_filter_add_pattern (filter, "*");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Image Files"));
-  gtk_file_filter_add_pixbuf_formats (filter);
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
-  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (chooser), filter);
+  /* setup the currently selected icon */
+  icon = g_object_get_data (G_OBJECT (uca_editor->icon_button), "thunar-uca-icon-name");
+  if (G_LIKELY (icon != NULL && *icon != '\0'))
+    exo_icon_chooser_dialog_set_icon (EXO_ICON_CHOOSER_DIALOG (chooser), icon);
 
-  image = g_object_new (GTK_TYPE_IMAGE, "height-request", 128 + 2 * 12, "width-request", 128 + 2 * 12, NULL);
-  g_signal_connect (G_OBJECT (chooser), "update-preview", G_CALLBACK (update_preview), image);
-  gtk_file_chooser_set_preview_widget_active (GTK_FILE_CHOOSER (chooser), FALSE);
-  gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (chooser), image);
-  gtk_widget_show (image);
-
-  /* use the datadir/pixmaps as default folder */
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), DATADIR "/pixmaps");
-
-  /* setup the currently selected icon file */
-  filename = g_object_get_data (G_OBJECT (uca_editor->icon_button), "thunar-uca-icon-filename");
-  if (G_LIKELY (filename != NULL && g_path_is_absolute (filename)))
-    gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (chooser), filename);
-
-  /* run the chooser dialog */
+  /* run the icon chooser dialog */
   if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT)
     {
-      /* remember the selected file for the icon */
-      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-      thunar_uca_editor_set_icon_name (uca_editor, filename);
-      g_free (filename);
+      /* remember the selected icon from the chooser */
+      icon = exo_icon_chooser_dialog_get_icon (EXO_ICON_CHOOSER_DIALOG (chooser));
+      thunar_uca_editor_set_icon_name (uca_editor, icon);
+      g_free (icon);
     }
 
+  /* destroy the chooser */
   gtk_widget_destroy (chooser);
 }
 
@@ -707,8 +656,6 @@ thunar_uca_editor_set_icon_name (ThunarUcaEditor *uca_editor,
   GdkPixbuf    *icon = NULL;
   GtkWidget    *image;
   GtkWidget    *label;
-  gint          icon_height;
-  gint          icon_width;
 
   g_return_if_fail (THUNAR_UCA_IS_EDITOR (uca_editor));
 
@@ -720,7 +667,7 @@ thunar_uca_editor_set_icon_name (ThunarUcaEditor *uca_editor,
   if (G_LIKELY (icon_name != NULL && g_path_is_absolute (icon_name)))
     {
       /* load the icon from the file */
-      icon = gdk_pixbuf_new_from_file (icon_name, NULL);
+      icon = exo_gdk_pixbuf_new_from_file_at_max_size (icon_name, 48, 48, TRUE, NULL);
     }
   else if (icon_name != NULL)
     {
@@ -738,14 +685,9 @@ thunar_uca_editor_set_icon_name (ThunarUcaEditor *uca_editor,
   if (G_LIKELY (icon != NULL))
     {
       /* scale down the icon if required */
-      icon_width = gdk_pixbuf_get_width (icon);
-      icon_height = gdk_pixbuf_get_height (icon);
-      if (G_UNLIKELY (icon_width > 48 || icon_height > 48))
-        {
-          icon_scaled = exo_gdk_pixbuf_scale_ratio (icon, 48);
-          g_object_unref (G_OBJECT (icon));
-          icon = icon_scaled;
-        }
+      icon_scaled = exo_gdk_pixbuf_scale_down (icon, TRUE, 48, 48);
+      g_object_unref (G_OBJECT (icon));
+      icon = icon_scaled;
 
       /* setup an image for the icon */
       image = gtk_image_new_from_pixbuf (icon);
diff --git a/plugins/thunar-uca/thunar-uca-model.c b/plugins/thunar-uca/thunar-uca-model.c
index 01eec8de9def96547561d4520c71e87022be84ec..4f9a83427216ec1038def24f11cd8a80944ae1d6 100644
--- a/plugins/thunar-uca/thunar-uca-model.c
+++ b/plugins/thunar-uca/thunar-uca-model.c
@@ -1514,7 +1514,7 @@ thunar_uca_model_parse_argv (ThunarUcaModel *uca_model,
                     goto error;
 
                   dirname = g_path_get_dirname (path);
-                  quoted = g_shell_quote (path);
+                  quoted = g_shell_quote (dirname);
                   g_string_append (command_line, quoted);
                   g_free (dirname);
                   g_free (quoted);
@@ -1536,7 +1536,7 @@ thunar_uca_model_parse_argv (ThunarUcaModel *uca_model,
                     goto error;
 
                   dirname = g_path_get_dirname (path);
-                  quoted = g_shell_quote (path);
+                  quoted = g_shell_quote (dirname);
                   g_string_append (command_line, quoted);
                   g_free (dirname);
                   g_free (quoted);
diff --git a/po/ChangeLog b/po/ChangeLog
index a2878036e672ad6b7cff1d84b6872f42170e3d37..b85c2b859d98963d22aea712f4370979ff429bc2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-26  Benedikt Meurer <benny@xfce.org>
+
+	* POTFILES.in: Add new files here.
+	* Thunar.pot, *.po: Merge new strings.
+	* de.po: Update german translations.
+
 2006-08-24 Pau Rul-lan Ferragut <paurullan@bulma.net>
 
 	* ca.po: Update catalan translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d61deb0e4c16a095f10bc543ab246c5c3ad8c48a..a3b87dce4c88a1bc7d01e2921977bb981668d907 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -57,7 +57,6 @@ thunar/thunar-emblem-chooser.c
 thunar/thunar-enum-types.c
 thunar/thunar-file.c
 thunar/thunar-folder.c
-thunar/thunar-gdk-pixbuf-extensions.c
 thunar/thunar-gtk-extensions.c
 thunar/thunar-history.c
 thunar/thunar-icon-factory.c
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 2dc1707e706e6f8b835b6c39bce0a1e9e647381f..677e938bf0505aa4e91b811485b6cad5c6f32bf3 100644
--- a/po/Thunar.pot
+++ b/po/Thunar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+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"
@@ -682,39 +682,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr ""
 
@@ -804,6 +803,7 @@ msgstr ""
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "Go to the next visited folder"
 msgstr ""
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1812,7 +1812,6 @@ msgid "Audio Files"
 msgstr ""
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr ""
 
@@ -2922,33 +2921,33 @@ msgstr ""
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -2958,67 +2957,67 @@ msgid ""
 "if exactly one item is selected."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr ""
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3026,35 +3025,35 @@ msgid ""
 "doc)."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3068,8 +3067,10 @@ msgid ""
 "files."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, c-format
+msgid "Select an Icon for \"%s\""
 msgstr ""
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/ca.po b/po/ca.po
index 0c3eeb94a8b0ab0487d22106f709dcab6d18fa35..a24c2c24a1ec5f80d73999eaf7977f4f10171b90 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-24 08:54+0200\n"
 "Last-Translator: Pau Ruŀlan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -554,7 +554,9 @@ msgstr "Buida la pap_erera"
 msgid ""
 "If you choose to empty the Trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
-msgstr "Si esculliu buidar la paperera es perdran tots els fitxers permanentment. Recordeu que els podeu esborrar per separat."
+msgstr ""
+"Si esculliu buidar la paperera es perdran tots els fitxers permanentment. "
+"Recordeu que els podeu esborrar per separat."
 
 #: ../thunar/thunar-application.c:1290
 msgid "Emptying the Trash..."
@@ -579,7 +581,9 @@ msgstr "C_rea una carpeta"
 msgid ""
 "The folder \"%s\" does not exist anymore, but it is required to restore the "
 "file \"%s\" from the trash. Do you want to create the folder again?"
-msgstr "El directori «%s» ja no existeix però sel necessita per recuperar el fitxer «%s» de la paperera. Voleu crear del directori de  nou?"
+msgstr ""
+"El directori «%s» ja no existeix però sel necessita per recuperar el fitxer "
+"«%s» de la paperera. Voleu crear del directori de  nou?"
 
 #. display an error dialog
 #: ../thunar/thunar-application.c:1419
@@ -702,39 +706,38 @@ msgstr ""
 "personalitzada d'«Obre amb» del gestor de fitxers."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Seleccioneu una aplicació"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Fitxer executables"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Seqüències en Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Seqüències en Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Seqüències en Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Seqüències d'intèrpret d'ordres"
 
@@ -830,6 +833,7 @@ msgstr "Expand_eix les columnes automàticament així com sigui necessari"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -993,7 +997,7 @@ msgstr "Endavant"
 msgid "Go to the next visited folder"
 msgstr "Vés a la carpeta visitada posteriorment"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1878,7 +1882,6 @@ msgid "Audio Files"
 msgstr "Fitxers d'audio"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
@@ -2893,7 +2896,10 @@ msgid ""
 "When sending a file via email, you can either choose to send the file "
 "directly, as is, or compress the file before attaching it to an email. It is "
 "highly recommended to compress large files before sending them."
-msgstr "Quan envieu fitxers per correu podeu escollir enviar-los directament o comprimir-los abans d’adjuntar-los al correu. Es molt recomenable comprimir els fitxers grans abans d’enviar-los."
+msgstr ""
+"Quan envieu fitxers per correu podeu escollir enviar-los directament o "
+"comprimir-los abans d’adjuntar-los al correu. Es molt recomenable comprimir "
+"els fitxers grans abans d’enviar-los."
 
 #: ../plugins/thunar-sendto-email/main.c:192
 #, c-format
@@ -2912,7 +2918,11 @@ msgid ""
 "files directly, attaching multiple files to an email, or send all files "
 "compressed into a single archive file and attach the archive. It is highly "
 "recommended to send multiple large files as archive."
-msgstr "Quan envieu multíples fitxers per correu podeu enviar els fitxers directament adjuntant els fitxers a un correu o podeu enviar-los tots amb un sol fitxer comprimit. Es molt recomenable enviar els múltiples fitxers com un arxiu."
+msgstr ""
+"Quan envieu multíples fitxers per correu podeu enviar els fitxers "
+"directament adjuntant els fitxers a un correu o podeu enviar-los tots amb un "
+"sol fitxer comprimit. Es molt recomenable enviar els múltiples fitxers com "
+"un arxiu."
 
 #. allocate the progress dialog
 #. setup the label
@@ -3026,23 +3036,23 @@ msgstr "No s'ha pogut desar l'acció al disc."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Bàsic"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "El nom de l'acció que es mostrarà al menú contextual."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Descripció:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3050,11 +3060,11 @@ msgstr ""
 "La descripció de l'acció que serà mostrada com rètol indicador a la barra "
 "d'estat quan seleccioneu l'element des del menú contextual."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Ordre:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3070,23 +3080,23 @@ msgstr ""
 "s'aplicarà sols i s'ha seleccionat un element. En cas contrari, és a dir amb "
 "minúscules, l'acció sols es durà a terme si s'ha seleccionat un element."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Navegueu pel sistema de fitxers i trieu una aplicació amb la qual dur a "
 "terme aquesta acció."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Icona:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Sense icona"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3094,7 +3104,7 @@ msgstr ""
 "Preméu aquest botó per seleccionar un fitxer d'icona que es mostrarà al menú "
 "contextual a més a més de l'acció seleccionada anteriorment."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3102,41 +3112,41 @@ msgstr ""
 "Aquests paràmetres seran substituits\n"
 "quan llanceu l'acció:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "el camí pel primer fitxer seleccionat"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "el camí per tots els fitxers seleccionats"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "el directori que conté el fitxer vingut de %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "els directoris que contenen els fitxers que són passats mitjançant %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "el primer fitxer seleccionat (sense camí)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "els fitxers seleccionats (sense camins)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Condicions d'aparició"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Fitxer patró:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3147,35 +3157,35 @@ msgstr ""
 "acció s'hauria de mostrar pel fitxer seleccionat. Si especificau més d'una "
 "patró haureu de separar amb punts i comes (per exemple: *.txt; *.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Apareix si el contingut conté:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Directoris"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "Fitxers d'_audio"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Fitxers d'_imatge"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Fitxers de _text"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Fitxers de _video"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "Altres _fitxers"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3199,8 +3209,10 @@ msgstr ""
 "d'especificar que l'acció s'haurà de dur a terme\n"
 "segons el tipus de fitxers."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Seleccioneu una icona"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/cs.po b/po/cs.po
index 0272d2407b9943a34c28468c7faf5f7c9ffcbe1a..1e7e69296866228e4a160955433abd3da5f421a4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-18 00:13+0100\n"
 "Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
 "Language-Team: Čeština <translation-team-cs@lists.sourceforge.net>\n"
@@ -35,8 +35,7 @@ msgstr "Nebylo zadáno pole Exec"
 msgid "No URL field specified"
 msgstr "Nebyla zadána adresa URL"
 
-#: ../thunar-vfs/thunar-vfs-info.c:362
-#: ../thunar-vfs/thunar-vfs-io-local.c:870
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:870
 msgid "Invalid desktop file"
 msgstr "Neplatný soubor pracovní plochy"
 
@@ -105,8 +104,7 @@ msgstr "Nepodařilo se zapsat data do souboru \"%s\""
 #. display an error to the user
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:234
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:297
-#: ../thunar-vfs/thunar-vfs-io-ops.c:496
-#: ../thunar/thunar-chooser-dialog.c:787
+#: ../thunar-vfs/thunar-vfs-io-ops.c:496 ../thunar/thunar-chooser-dialog.c:787
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Nepodařilo se odstranit soubor \"%s\""
@@ -122,8 +120,7 @@ msgid "copy of %s"
 msgstr "kopie %s"
 
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
-#: ../thunar/thunar-list-model.c:777
-#: ../thunar/thunar-properties-dialog.c:762
+#: ../thunar/thunar-list-model.c:777 ../thunar/thunar-properties-dialog.c:762
 #, c-format
 msgid "link to %s"
 msgstr "odkaz na %s"
@@ -284,8 +281,7 @@ msgid "The icon of the mime handler"
 msgstr "Ikona pro obsluhu typu MIME"
 
 #: ../thunar-vfs/thunar-vfs-mime-handler.c:174
-#: ../thunar/thunar-enum-types.c:94
-#: ../thunar/thunar-renamer-dialog.c:427
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:427
 #: ../thunarx/thunarx-renamer.c:177
 msgid "Name"
 msgstr "Název"
@@ -321,8 +317,7 @@ msgstr "Operace není podporována"
 msgid "Invalidly escaped characters"
 msgstr "Neplatně zadané znaky pomocí tzv. escape sekvence"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:222
-#: ../thunar/thunar-enum-types.c:97
+#: ../thunar-vfs/thunar-vfs-thumb.c:222 ../thunar/thunar-enum-types.c:97
 msgid "Size"
 msgstr "Velikost"
 
@@ -470,8 +465,7 @@ msgid "Sort items in descending order"
 msgstr "Seřadit položky v sestupném pořadí"
 
 #. display an error message to the user
-#: ../thunar/thunar-application.c:361
-#: ../thunar/thunar-application.c:405
+#: ../thunar/thunar-application.c:361 ../thunar/thunar-application.c:405
 msgid "Failed to launch operation"
 msgstr "Nepodařilo se spustit operaci"
 
@@ -486,8 +480,7 @@ msgstr "Nepodařilo se otevřít soubor \"%s\""
 msgid "Failed to open \"%s\": %s"
 msgstr "Nepodařilo se otevřít soubor \"%s\": %s"
 
-#: ../thunar/thunar-application.c:907
-#: ../thunar/thunar-application.c:940
+#: ../thunar/thunar-application.c:907 ../thunar/thunar-application.c:940
 msgid "Copying files..."
 msgstr "Kopíruji soubory..."
 
@@ -549,15 +542,18 @@ msgstr "Odebrat všechny soubory a adresáře z koše?"
 #. add the "Empty Trash" menu item
 #: ../thunar/thunar-application.c:1269
 #: ../thunar/thunar-location-buttons.c:1265
-#: ../thunar/thunar-shortcuts-view.c:855
-#: ../thunar/thunar-tree-view.c:1076
+#: ../thunar/thunar-shortcuts-view.c:855 ../thunar/thunar-tree-view.c:1076
 #: ../plugins/thunar-tpa/main.c:49
 msgid "_Empty Trash"
 msgstr "Vy_sypat koš"
 
 #: ../thunar/thunar-application.c:1273
-msgid "If you choose to empty the Trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "Zvolíte-li vyprázdnění koše, všechny položky budou nenávratně ztraceny. Můžete je také mazat odděleně."
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Zvolíte-li vyprázdnění koše, všechny položky budou nenávratně ztraceny. "
+"Můžete je také mazat odděleně."
 
 #: ../thunar/thunar-application.c:1290
 msgid "Emptying the Trash..."
@@ -579,8 +575,12 @@ msgstr "Vy_tvořit adresář"
 
 #: ../thunar/thunar-application.c:1382
 #, c-format
-msgid "The folder \"%s\" does not exist anymore, but it is required to restore the file \"%s\" from the trash. Do you want to create the folder again?"
-msgstr "Adresář \"%s\" již neexistuje, ale je vyžadován pro obnovení souboru \"%s\" z koše. Chcete tento adresář znovu vytvořit?"
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+"Adresář \"%s\" již neexistuje, ale je vyžadován pro obnovení souboru \"%s\" "
+"z koše. Chcete tento adresář znovu vytvořit?"
 
 #. display an error dialog
 #: ../thunar/thunar-application.c:1419
@@ -594,8 +594,7 @@ msgstr "Obnovuji soubory..."
 
 #. tell the user that it didn't work
 #. display an error to the user
-#: ../thunar/thunar-chooser-button.c:275
-#: ../thunar/thunar-chooser-dialog.c:506
+#: ../thunar/thunar-chooser-button.c:275 ../thunar/thunar-chooser-dialog.c:506
 #, c-format
 msgid "Failed to set default application for \"%s\""
 msgstr "Nepodařilo se nastavit výchozí aplikaci pro \"%s\""
@@ -606,16 +605,17 @@ msgstr "Nebyla vybrána žádná aplikace"
 
 #: ../thunar/thunar-chooser-button.c:366
 #, c-format
-msgid "The selected application is used to open this and other files of type \"%s\"."
-msgstr "Vybraná aplikace bude použita k otevření tohoto a jiných souborů typu \"%s\"."
+msgid ""
+"The selected application is used to open this and other files of type \"%s\"."
+msgstr ""
+"Vybraná aplikace bude použita k otevření tohoto a jiných souborů typu \"%s\"."
 
 #. add the "Other Application..." choice
 #: ../thunar/thunar-chooser-button.c:504
 msgid "_Other Application..."
 msgstr "Jiná _aplikace..."
 
-#: ../thunar/thunar-chooser-dialog.c:220
-#: ../thunar/thunar-launcher.c:140
+#: ../thunar/thunar-chooser-dialog.c:220 ../thunar/thunar-launcher.c:140
 msgid "Open With"
 msgstr "Otevřít pomocí"
 
@@ -625,8 +625,11 @@ msgid "Use a _custom command:"
 msgstr "Použít _vlastní příkaz"
 
 #: ../thunar/thunar-chooser-dialog.c:287
-msgid "Use a custom command for an application that is not available from the above application list."
-msgstr "Použije vlastní příkaz pro aplikaci, která není dostupná v seznamu výše."
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Použije vlastní příkaz pro aplikaci, která není dostupná v seznamu výše."
 
 #. create the "Custom command" button
 #: ../thunar/thunar-chooser-dialog.c:306
@@ -663,12 +666,15 @@ msgstr "Otevřít <i>%s</i> a další soubory typu \"%s\" pomocí:"
 
 #: ../thunar/thunar-chooser-dialog.c:713
 #, c-format
-msgid "Browse the file system to select an application to open files of type \"%s\"."
+msgid ""
+"Browse the file system to select an application to open files of type \"%s\"."
 msgstr "Vybrat aplikaci pro soubory typu \"%s\" procházením systému souborů"
 
 #: ../thunar/thunar-chooser-dialog.c:719
 #, c-format
-msgid "Change the default application for files of type \"%s\" to the selected application."
+msgid ""
+"Change the default application for files of type \"%s\" to the selected "
+"application."
 msgstr "Změnit výchozí aplikaci pro soubory typu \"%s\" na vybranou aplikaci."
 
 #: ../thunar/thunar-chooser-dialog.c:766
@@ -678,48 +684,51 @@ msgstr "Jste si jisti, že chcete trvale odstranit \"%s\"?"
 
 #: ../thunar/thunar-chooser-dialog.c:772
 msgid ""
-"This will remove the application launcher that appears in the file context menu, but will not uninstall the application itself.\n"
+"This will remove the application launcher that appears in the file context "
+"menu, but will not uninstall the application itself.\n"
 "\n"
-"You can only remove application launchers that were created using the custom command box in the \"Open With\" dialog of the file manager."
+"You can only remove application launchers that were created using the custom "
+"command box in the \"Open With\" dialog of the file manager."
 msgstr ""
-"Odebere spouštěč aplikace objevující se v kontextové nabídce souboru, neodinstaluje však samotnou aplikaci.\n"
+"Odebere spouštěč aplikace objevující se v kontextové nabídce souboru, "
+"neodinstaluje však samotnou aplikaci.\n"
 "\n"
-"Můžete odebrat pouze spouštěče aplikací, které byly vytvořeny použitím vlastního příkazu v dialogu \"Otevřít pomocí\" správce souborů."
+"Můžete odebrat pouze spouštěče aplikací, které byly vytvořeny použitím "
+"vlastního příkazu v dialogu \"Otevřít pomocí\" správce souborů."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Vyberte aplikaci"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "VÅ¡echny soubory"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Spustitelné soubory"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Skripty jazyka Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Skripty jazyka Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Skripty jazyka Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shellové skripty"
 
@@ -809,14 +818,13 @@ msgstr "Automaticky rozšířit sloupc_e podle potřeby"
 #. the file_time is invalid
 #. reset page title
 #. tell the user that we're unable to determine the file info
-#: ../thunar/thunar-column-model.c:890
-#: ../thunar/thunar-list-model.c:727
+#: ../thunar/thunar-column-model.c:890 ../thunar/thunar-list-model.c:727
 #: ../thunar/thunar-list-model.c:756
-#: ../thunar/thunar-permissions-chooser.c:273
-#: ../thunar/thunar-util.c:131
+#: ../thunar/thunar-permissions-chooser.c:273 ../thunar/thunar-util.c:131
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Neznámý"
 
@@ -832,8 +840,7 @@ msgstr "Stručný pohled"
 msgid "C_reate"
 msgstr "Vy_tvořit"
 
-#: ../thunar/thunar-create-dialog.c:181
-#: ../thunar/thunar-standard-view.c:2207
+#: ../thunar/thunar-create-dialog.c:181 ../thunar/thunar-standard-view.c:2207
 msgid "Enter the new name:"
 msgstr "Zadejte nový název:"
 
@@ -865,8 +872,7 @@ msgstr "translator-credits"
 
 #. display an error message to the user
 #. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:229
-#: ../thunar/thunar-renamer-dialog.c:981
+#: ../thunar/thunar-dialogs.c:229 ../thunar/thunar-renamer-dialog.c:981
 msgid "Failed to open the documentation browser"
 msgstr "Nepodařilo se otevřít prohlížeč dokumentace"
 
@@ -904,8 +910,7 @@ msgstr "Umístit _odkaz sem"
 
 #. display an error to the user
 #. display an error message to the user
-#: ../thunar/thunar-dnd.c:192
-#: ../thunar/thunar-launcher.c:526
+#: ../thunar/thunar-dnd.c:192 ../thunar/thunar-launcher.c:526
 #, c-format
 msgid "Failed to execute file \"%s\""
 msgstr "Nepodařilo se spustit soubor \"%s\""
@@ -945,8 +950,7 @@ msgstr "Vlastník"
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-enum-types.c:96
-#: ../thunar/thunar-properties-dialog.c:491
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:491
 msgid "Permissions"
 msgstr "Přístupová práva"
 
@@ -984,7 +988,7 @@ msgstr "Vpřed"
 msgid "Go to the next visited folder"
 msgstr "Přejde na další otevřený adresář"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr "Nepodařilo se načíst ikonu z \"%s\" (%s). Ověřte správnost instalace!"
@@ -998,19 +1002,15 @@ msgid "Icon view"
 msgstr "Ikony"
 
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:137
-#: ../thunar/thunar-launcher.c:783
+#: ../thunar/thunar-launcher.c:137 ../thunar/thunar-launcher.c:783
 #: ../thunar/thunar-location-buttons.c:1220
-#: ../thunar/thunar-shortcuts-view.c:796
-#: ../thunar/thunar-tree-view.c:1016
+#: ../thunar/thunar-shortcuts-view.c:796 ../thunar/thunar-tree-view.c:1016
 msgid "_Open"
 msgstr "_Otevřít"
 
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:138
-#: ../thunar/thunar-location-buttons.c:1233
-#: ../thunar/thunar-shortcuts-view.c:807
-#: ../thunar/thunar-tree-view.c:1028
+#: ../thunar/thunar-launcher.c:138 ../thunar/thunar-location-buttons.c:1233
+#: ../thunar/thunar-shortcuts-view.c:807 ../thunar/thunar-tree-view.c:1028
 msgid "Open in New Window"
 msgstr "Otevřít v novém okně"
 
@@ -1018,13 +1018,11 @@ msgstr "Otevřít v novém okně"
 msgid "Open the selected directory in a new window"
 msgstr "Otevře vybraný adresář v novém okně"
 
-#: ../thunar/thunar-launcher.c:139
-#: ../thunar/thunar-launcher.c:141
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
 msgid "Open With Other _Application..."
 msgstr "Otevřít v jiné _aplikaci..."
 
-#: ../thunar/thunar-launcher.c:139
-#: ../thunar/thunar-launcher.c:141
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
 #: ../thunar/thunar-launcher.c:866
 msgid "Choose another application with which to open the selected file"
 msgstr "Vybere jinou aplikaci pro otevření vybraného souboru"
@@ -1108,8 +1106,7 @@ msgstr[2] "Spustit vybrané soubory"
 msgid "_Open With \"%s\""
 msgstr "_Spustit pomocí \"%s\""
 
-#: ../thunar/thunar-launcher.c:842
-#: ../thunar/thunar-launcher.c:931
+#: ../thunar/thunar-launcher.c:842 ../thunar/thunar-launcher.c:931
 #, c-format
 msgid "Use \"%s\" to open the selected file"
 msgid_plural "Use \"%s\" to open the selected files"
@@ -1159,8 +1156,7 @@ msgstr[0] "Odeslat vybraný soubor do \"%s\""
 msgstr[1] "Odeslat vybrané soubory do \"%s\""
 msgstr[2] "Odeslat vybrané soubory do \"%s\""
 
-#: ../thunar/thunar-list-model.c:775
-#: ../thunar/thunar-properties-dialog.c:760
+#: ../thunar/thunar-list-model.c:775 ../thunar/thunar-properties-dialog.c:760
 msgid "broken link"
 msgstr "neplatný odkaz"
 
@@ -1209,8 +1205,7 @@ msgstr "\"%s\" (%s) %s"
 #. * where the trashed file/folder was located before it was moved to the trash), otherwise the
 #. * properties dialog width will be messed up.
 #.
-#: ../thunar/thunar-list-model.c:2256
-#: ../thunar/thunar-properties-dialog.c:340
+#: ../thunar/thunar-list-model.c:2256 ../thunar/thunar-properties-dialog.c:340
 msgid "Original Path:"
 msgstr "Původní cesta:"
 
@@ -1264,8 +1259,7 @@ msgstr "Vytvořit nový adresář v \"%s\""
 
 #. append the "Create Folder" menu action
 #: ../thunar/thunar-location-buttons.c:1251
-#: ../thunar/thunar-standard-view.c:316
-#: ../thunar/thunar-tree-view.c:1092
+#: ../thunar/thunar-standard-view.c:316 ../thunar/thunar-tree-view.c:1092
 msgid "Create _Folder..."
 msgstr "Vytvořit _adresář..."
 
@@ -1276,8 +1270,11 @@ msgstr "Smazat všechny soubory a adresáře v Koši"
 #. add the "Paste Into Folder" action
 #: ../thunar/thunar-location-buttons.c:1280
 #, c-format
-msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
-msgstr "Zkopírovat nebo přesunout dřívější výběr pomocí příkazů Vyjmout a Zkopírovat do \"%s\""
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgstr ""
+"Zkopírovat nebo přesunout dřívější výběr pomocí příkazů Vyjmout a Zkopírovat "
+"do \"%s\""
 
 #: ../thunar/thunar-location-buttons.c:1281
 #: ../thunar/thunar-standard-view.c:322
@@ -1296,14 +1293,12 @@ msgstr "_Vlastnosti"
 
 #. ask the user to enter a name for the new folder
 #: ../thunar/thunar-location-buttons.c:1366
-#: ../thunar/thunar-standard-view.c:1785
-#: ../thunar/thunar-tree-view.c:1448
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "New Folder"
 msgstr "Nový adresář"
 
 #: ../thunar/thunar-location-buttons.c:1366
-#: ../thunar/thunar-standard-view.c:1785
-#: ../thunar/thunar-tree-view.c:1448
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "Create New Folder"
 msgstr "Vytvořit nový adresář"
 
@@ -1315,8 +1310,7 @@ msgstr "Otevřít umístění"
 msgid "_Location:"
 msgstr "_Umístění:"
 
-#: ../thunar/thunar-location-entry.c:423
-#: ../thunar/thunar-window.c:1210
+#: ../thunar/thunar-location-entry.c:423 ../thunar/thunar-window.c:1210
 #, c-format
 msgid "Failed to launch \"%s\""
 msgstr "Nepodařilo se spustit \"%s\""
@@ -1428,8 +1422,14 @@ msgid "Do _not ask me again"
 msgstr "Příště se již _nedotazovat"
 
 #: ../thunar/thunar-permissions-chooser.c:626
-msgid "If you select this option your choice will be remembered and you won't be asked again. You can use the preferences dialog to alter your choice afterwards."
-msgstr "Zvolíte-li tuto možnost, Vaše volba bude použita i příště a nebudete již dotazováni. K pozdější změně Vašeho nastavení použijte dialogové okno Možnosti."
+msgid ""
+"If you select this option your choice will be remembered and you won't be "
+"asked again. You can use the preferences dialog to alter your choice "
+"afterwards."
+msgstr ""
+"Zvolíte-li tuto možnost, Vaše volba bude použita i příště a nebudete již "
+"dotazováni. K pozdější změně Vašeho nastavení použijte dialogové okno "
+"Možnosti."
 
 #. display an error to the user
 #: ../thunar/thunar-permissions-chooser.c:706
@@ -1455,8 +1455,14 @@ msgid "Correct folder permissions"
 msgstr "Opravit přístupová práva k adresáři"
 
 #: ../thunar/thunar-permissions-chooser.c:1076
-msgid "The folder permissions will be reset to a consistent state. Only users allowed to read the contents of this folder will be allowed to enter the folder afterwards."
-msgstr "Přístupová práva k adresáři budou anulována na konzistentní stav. Přístup k adresáři bude poté povolen jen uživatelům, oprávněným ke čtení tohoto adresáře."
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+"Přístupová práva k adresáři budou anulována na konzistentní stav. Přístup k "
+"adresáři bude poté povolen jen uživatelům, oprávněným ke čtení tohoto "
+"adresáře."
 
 #: ../thunar/thunar-preferences-dialog.c:222
 msgid "File Manager Preferences"
@@ -1507,16 +1513,24 @@ msgid "_Show thumbnails"
 msgstr "Z_obrazovat náhledy"
 
 #: ../thunar/thunar-preferences-dialog.c:294
-msgid "Select this option to display previewable files within a folder as automatically generated thumbnail icons."
-msgstr "Vyberte tuto možnost pro zobrazení náhledů u souborů v adresářích s automaticky generovanými náhledy."
+msgid ""
+"Select this option to display previewable files within a folder as "
+"automatically generated thumbnail icons."
+msgstr ""
+"Vyberte tuto možnost pro zobrazení náhledů u souborů v adresářích s "
+"automaticky generovanými náhledy."
 
 #: ../thunar/thunar-preferences-dialog.c:315
 msgid "_Text beside icons"
 msgstr "_Popisky vedle ikon"
 
 #: ../thunar/thunar-preferences-dialog.c:317
-msgid "Select this option to place the icon captions for items beside the icon rather than below the icon."
-msgstr "Vyberte tuto možnost pro zobrazení popisků vedle ikon namísto zobrazení popisků pod ikonami."
+msgid ""
+"Select this option to place the icon captions for items beside the icon "
+"rather than below the icon."
+msgstr ""
+"Vyberte tuto možnost pro zobrazení popisků vedle ikon namísto zobrazení "
+"popisků pod ikonami."
 
 #.
 #. Side Pane
@@ -1573,8 +1587,13 @@ msgid "Show Icon _Emblems"
 msgstr "Zobrazovat _emblémy"
 
 #: ../thunar/thunar-preferences-dialog.c:378
-msgid "Select this option to display icon emblems in the shortcuts pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Vyberte tuto možnost pro zobrazení emblémů v panelu záložek pro všechny adresáře, pro které byly emblémy definovány v dialogovém okně vlastností adresáře."
+msgid ""
+"Select this option to display icon emblems in the shortcuts pane for all "
+"folders for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Vyberte tuto možnost pro zobrazení emblémů v panelu záložek pro všechny "
+"adresáře, pro které byly emblémy definovány v dialogovém okně vlastností "
+"adresáře."
 
 #: ../thunar/thunar-preferences-dialog.c:387
 msgid "Tree Pane"
@@ -1589,8 +1608,13 @@ msgid "Show Icon E_mblems"
 msgstr "Zobrazovat e_mblémy"
 
 #: ../thunar/thunar-preferences-dialog.c:429
-msgid "Select this option to display icon emblems in the tree pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Vyberte tuto možnost pro zobrazení emblémů v panelu se stromovou strukturou pro všechny adresáře, pro které byly emblémy definovány pomocí dialogového okna vlastnosti."
+msgid ""
+"Select this option to display icon emblems in the tree pane for all folders "
+"for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Vyberte tuto možnost pro zobrazení emblémů v panelu se stromovou strukturou "
+"pro všechny adresáře, pro které byly emblémy definovány pomocí dialogového "
+"okna vlastnosti."
 
 #.
 #. Behavior
@@ -1616,8 +1640,18 @@ msgstr ""
 "po přejetí ukazatelem myši:"
 
 #: ../thunar/thunar-preferences-dialog.c:492
-msgid "When single-click activation is enabled, pausing the mouse pointer over an item will automatically select that item after the chosen delay. You can disable this behavior by moving the slider to the left-most position. This behavior may be useful when single clicks activate items, and you want only to select the item without activating it."
-msgstr "Pokud je zapnuta aktivace jednoduchým kliknutím, zastavení ukazatele myši automaticky vybere položku po zvolené době. Toto chování můžete vypnout posunutím posuvníku zcela vlevo. Toto chování může být užitečné při zapnutí možnosti \"aktivace položky jedním kliknutím\", pokud chcete položku pouze vybrat, nikoli však aktivovat."
+msgid ""
+"When single-click activation is enabled, pausing the mouse pointer over an "
+"item will automatically select that item after the chosen delay. You can "
+"disable this behavior by moving the slider to the left-most position. This "
+"behavior may be useful when single clicks activate items, and you want only "
+"to select the item without activating it."
+msgstr ""
+"Pokud je zapnuta aktivace jednoduchým kliknutím, zastavení ukazatele myši "
+"automaticky vybere položku po zvolené době. Toto chování můžete vypnout "
+"posunutím posuvníku zcela vlevo. Toto chování může být užitečné při zapnutí "
+"možnosti \"aktivace položky jedním kliknutím\", pokud chcete položku pouze "
+"vybrat, nikoli však aktivovat."
 
 #: ../thunar/thunar-preferences-dialog.c:516
 msgid "Disabled"
@@ -1765,18 +1799,15 @@ msgstr "Vlastnosti %s"
 msgid "Failed to rename \"%s\""
 msgstr "Nepodařilo se přejmenovat \"%s\""
 
-#: ../thunar/thunar-renamer-dialog.c:172
-#: ../thunar/thunar-window.c:253
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:253
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../thunar/thunar-renamer-dialog.c:173
-#: ../thunar/thunar-window.c:255
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:255
 msgid "_Send To"
 msgstr "Ode_slat"
 
-#: ../thunar/thunar-renamer-dialog.c:174
-#: ../thunar/thunar-standard-view.c:314
+#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-standard-view.c:314
 msgid "File Context Menu"
 msgstr "Kontextová nabídka souboru"
 
@@ -1796,8 +1827,7 @@ msgstr "Vyčistit"
 msgid "Clear the file list below"
 msgstr "Vyčistit seznam souborů níže"
 
-#: ../thunar/thunar-renamer-dialog.c:178
-#: ../thunar/thunar-window.c:274
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:274
 msgid "_About"
 msgstr "O _aplikaci"
 
@@ -1805,13 +1835,11 @@ msgstr "O _aplikaci"
 msgid "Display information about Thunar Bulk Rename"
 msgstr "Zobrazit informace o aplikaci Thunar Bulk Rename"
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:317
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:317
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "View the properties of the selected file"
 msgstr "Zobrazit vlastnosti vybraného souboru"
 
@@ -1827,7 +1855,8 @@ msgid "_Rename Files"
 msgstr "_Přejmenovat soubory"
 
 #: ../thunar/thunar-renamer-dialog.c:371
-msgid "Click here to actually rename the files listed above to their new names."
+msgid ""
+"Click here to actually rename the files listed above to their new names."
 msgstr "Klikněte sem pro přejmenování souborů podle výše popsaného návrhu."
 
 #: ../thunar/thunar-renamer-dialog.c:443
@@ -1862,7 +1891,6 @@ msgid "Audio Files"
 msgstr "Zvukové soubory"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Obrázky"
 
@@ -1895,8 +1923,10 @@ msgstr[2] "Odstranit soubory"
 msgid "Remove the selected file from the list of files to be renamed"
 msgid_plural "Remove the selected files from the list of files to be renamed"
 msgstr[0] "Odstranit vybraný soubor ze seznamu souborů určených k přejmenování"
-msgstr[1] "Odstranit vybrané soubory ze seznamu souborů určených k přejmenování"
-msgstr[2] "Odstranit vybrané soubory ze seznamu souborů určených k přejmenování"
+msgstr[1] ""
+"Odstranit vybrané soubory ze seznamu souborů určených k přejmenování"
+msgstr[2] ""
+"Odstranit vybrané soubory ze seznamu souborů určených k přejmenování"
 
 #. change title to reflect the standalone status
 #: ../thunar/thunar-renamer-dialog.c:1702
@@ -1909,8 +1939,14 @@ msgid "Failed to rename \"%s\" to \"%s\"."
 msgstr "Nepodařilo se přejmenovat \"%s\" na \"%s\"."
 
 #: ../thunar/thunar-renamer-progress.c:221
-msgid "You can either choose to skip this file and continue to rename the remaining files, or revert the previously renamed files to their previous names, or cancel the operation without reverting previous changes."
-msgstr "Tento soubor můžete přeskočit a pokračovat v přejmenovávání zbývajících souborů nebo obnovit všechny názvy dosud přejmenovaných souborů nebo zrušit operaci bez obnovení již přejmenovaných souborů."
+msgid ""
+"You can either choose to skip this file and continue to rename the remaining "
+"files, or revert the previously renamed files to their previous names, or "
+"cancel the operation without reverting previous changes."
+msgstr ""
+"Tento soubor můžete přeskočit a pokračovat v přejmenovávání zbývajících "
+"souborů nebo obnovit všechny názvy dosud přejmenovaných souborů nebo zrušit "
+"operaci bez obnovení již přejmenovaných souborů."
 
 #: ../thunar/thunar-renamer-progress.c:226
 msgid "_Revert Changes"
@@ -1922,8 +1958,11 @@ msgid "_Skip This File"
 msgstr "_Přeskočit tento soubor"
 
 #: ../thunar/thunar-renamer-progress.c:233
-msgid "Do you want to skip this file and continue to rename the remaining files?"
-msgstr "Chcete přeskočit tento soubor a pokračovat v přejmenovávání zbývajících souborů?"
+msgid ""
+"Do you want to skip this file and continue to rename the remaining files?"
+msgstr ""
+"Chcete přeskočit tento soubor a pokračovat v přejmenovávání zbývajících "
+"souborů?"
 
 #: ../thunar/thunar-shortcuts-pane.c:413
 msgid "Side Pane (Create Shortcut)"
@@ -1940,20 +1979,17 @@ msgstr[1] "Přidá vybrané adresáře do panelu se záložkami"
 msgstr[2] "Přidá vybrané adresáře do panelu se záložkami"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:821
-#: ../thunar/thunar-tree-view.c:1042
+#: ../thunar/thunar-shortcuts-view.c:821 ../thunar/thunar-tree-view.c:1042
 msgid "_Mount Volume"
 msgstr "_Připojit svazek"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:831
-#: ../thunar/thunar-tree-view.c:1052
+#: ../thunar/thunar-shortcuts-view.c:831 ../thunar/thunar-tree-view.c:1052
 msgid "E_ject Volume"
 msgstr "_Vysunout médium"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:840
-#: ../thunar/thunar-tree-view.c:1061
+#: ../thunar/thunar-shortcuts-view.c:840 ../thunar/thunar-tree-view.c:1061
 msgid "_Unmount Volume"
 msgstr "_Odpojit jednotku"
 
@@ -1978,15 +2014,13 @@ msgid "Failed to add new shortcut"
 msgstr "Nepodařilo se přidat novou záložku"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1293
-#: ../thunar/thunar-tree-view.c:1556
+#: ../thunar/thunar-shortcuts-view.c:1293 ../thunar/thunar-tree-view.c:1556
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Nepodařilo se vysunout \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1339
-#: ../thunar/thunar-tree-view.c:950
+#: ../thunar/thunar-shortcuts-view.c:1339 ../thunar/thunar-tree-view.c:950
 #: ../thunar/thunar-tree-view.c:1607
 #, c-format
 msgid "Failed to mount \"%s\""
@@ -1994,8 +2028,7 @@ msgstr "Nepodařilo se připojit \"%s\""
 
 #. display an error dialog to inform the user
 #. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1383
-#: ../thunar/thunar-tree-view.c:1747
+#: ../thunar/thunar-shortcuts-view.c:1383 ../thunar/thunar-tree-view.c:1747
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Nepodařilo se odpojit \"%s\""
@@ -2036,14 +2069,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Vytvořit prázdný adresář v aktuálním adresáři"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:318
-#: ../thunar/thunar-tree-view.c:1113
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1113
 msgid "Cu_t"
 msgstr "Vyjmou_t"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:319
-#: ../thunar/thunar-tree-view.c:1125
+#: ../thunar/thunar-standard-view.c:319 ../thunar/thunar-tree-view.c:1125
 msgid "_Copy"
 msgstr "_Kopírovat"
 
@@ -2053,17 +2084,22 @@ msgstr "_Vložit"
 
 #: ../thunar/thunar-standard-view.c:320
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Přesunout nebo zkopírovat soubory naposledy vybrané příkazem Vyjmout nebo Zkopírovat"
+msgstr ""
+"Přesunout nebo zkopírovat soubory naposledy vybrané příkazem Vyjmout nebo "
+"Zkopírovat"
 
 #. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:321
-#: ../thunar/thunar-tree-view.c:1160
+#: ../thunar/thunar-standard-view.c:321 ../thunar/thunar-tree-view.c:1160
 msgid "_Delete"
 msgstr "_Smazat"
 
 #: ../thunar/thunar-standard-view.c:322
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Přesune nebo zkopíruje naposledy vybrané soubory příkazem Vyjmout nebo Zkopírovat do vybraného adresáře"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Přesune nebo zkopíruje naposledy vybrané soubory příkazem Vyjmout nebo "
+"Zkopírovat do vybraného adresáře"
 
 #: ../thunar/thunar-standard-view.c:323
 msgid "Select _all Files"
@@ -2085,8 +2121,7 @@ msgstr "Vybere všechny soubory odpovídající zvolené masce"
 msgid "Du_plicate"
 msgstr "Du_plikovat"
 
-#: ../thunar/thunar-standard-view.c:326
-#: ../thunar/thunar-standard-view.c:3371
+#: ../thunar/thunar-standard-view.c:326 ../thunar/thunar-standard-view.c:3371
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Vytvořit _odkaz"
@@ -2480,17 +2515,24 @@ msgstr "O šablonách"
 
 #: ../thunar/thunar-window.c:1749
 msgid "All files in this folder will appear in the \"Create Document\" menu."
-msgstr "Všechny soubory v tomto adresáře si objeví v menu \"Vytvořit dokument\""
+msgstr ""
+"Všechny soubory v tomto adresáře si objeví v menu \"Vytvořit dokument\""
 
 #: ../thunar/thunar-window.c:1756
 msgid ""
-"If you frequently create certain kinds of documents, make a copy of one and put it in this folder. Thunar will add an entry for this document in the \"Create Document\" menu.\n"
+"If you frequently create certain kinds of documents, make a copy of one and "
+"put it in this folder. Thunar will add an entry for this document in the "
+"\"Create Document\" menu.\n"
 "\n"
-"You can then select the entry from the \"Create Document\" menu and a copy of the document will be created in the directory you are viewing."
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
 msgstr ""
-"Pokud často vytváříte určitý typ dokumentu, vytvořte si jednu kopii a tu umístěte do tohoto adresáře. Aplikace Thunar přidá položku pro tento dokument do nabídky \"Vytvořit dokument\".\n"
+"Pokud často vytváříte určitý typ dokumentu, vytvořte si jednu kopii a tu "
+"umístěte do tohoto adresáře. Aplikace Thunar přidá položku pro tento "
+"dokument do nabídky \"Vytvořit dokument\".\n"
 "\n"
-"Potom můžete zvolit položku z menu \"Vytvořit dokument\" a v aktuálním adresáři se vytvoří kopie dokumentu."
+"Potom můžete zvolit položku z menu \"Vytvořit dokument\" a v aktuálním "
+"adresáři se vytvoří kopie dokumentu."
 
 #: ../thunar/thunar-window.c:1768
 msgid "Do _not display this message again"
@@ -2549,8 +2591,11 @@ msgid "Description:"
 msgstr "Popis:"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:165
-msgid "The generic name of the entry, for example \"Web Browser\" in case of Firefox."
-msgstr "Obecný název položky, například \"Webový prohlížeč\" namísto názvu Firefox."
+msgid ""
+"The generic name of the entry, for example \"Web Browser\" in case of "
+"Firefox."
+msgstr ""
+"Obecný název položky, například \"Webový prohlížeč\" namísto názvu Firefox."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
 msgid "Command:"
@@ -2573,8 +2618,12 @@ msgid "Comment:"
 msgstr "Poznámka:"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:232
-msgid "Tooltip for the entry, for example \"View sites on the Internet\" in case of Firefox. Should not be redundant with the name or the description."
-msgstr "Tip pro položku, například \"Prohlíží internetové stránky\" v případě prohlížeče Firefox. Měl by být jednoznačný v názvu a v popisu."
+msgid ""
+"Tooltip for the entry, for example \"View sites on the Internet\" in case of "
+"Firefox. Should not be redundant with the name or the description."
+msgstr ""
+"Tip pro položku, například \"Prohlíží internetové stránky\" v případě "
+"prohlížeče Firefox. Měl by být jednoznačný v názvu a v popisu."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
 msgid "Options:"
@@ -2585,8 +2634,13 @@ msgid "Use _startup notification"
 msgstr "Použít _oznámení při spuštění"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:259
-msgid "Select this option to enable startup notification when the command is run from the file manager or the menu. Not every application supports startup notification."
-msgstr "Vyberte tuto možnost pro zapnutí oznámení při spuštění ze správce souborů nebo z nabídky. Každá aplikace však toto oznámení nepodporuje."
+msgid ""
+"Select this option to enable startup notification when the command is run "
+"from the file manager or the menu. Not every application supports startup "
+"notification."
+msgstr ""
+"Vyberte tuto možnost pro zapnutí oznámení při spuštění ze správce souborů "
+"nebo z nabídky. Každá aplikace však toto oznámení nepodporuje."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
 msgid "Run in _terminal"
@@ -2802,15 +2856,22 @@ msgid "Regular _Expression"
 msgstr "R_egulární výraz"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:231
-msgid "If you enable this option, the pattern will be treated as a regular expression and matched using the Perl-compatible regular expressions (PCRE). Check the documentation for details about the regular expression syntax."
-msgstr "Zvolíte-li tuto možnost, bude s hledanou sekvencí znaků zacházeno jako s regulárním výrazem, kompatibilním s regulárními výrazy jazyka Perl (PCRE). Více podrobností o regulárních výrazech najdete v dokumentaci."
+msgid ""
+"If you enable this option, the pattern will be treated as a regular "
+"expression and matched using the Perl-compatible regular expressions (PCRE). "
+"Check the documentation for details about the regular expression syntax."
+msgstr ""
+"Zvolíte-li tuto možnost, bude s hledanou sekvencí znaků zacházeno jako s "
+"regulárním výrazem, kompatibilním s regulárními výrazy jazyka Perl (PCRE). "
+"Více podrobností o regulárních výrazech najdete v dokumentaci."
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:238
 msgid "Replace _With:"
 msgstr "Nahra_dit:"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:246
-msgid "Enter the text that should be used as replacement for the pattern above."
+msgid ""
+"Enter the text that should be used as replacement for the pattern above."
 msgstr "Zadejte text, který bude použit jako náhrada textu zadaného výše."
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:258
@@ -2818,8 +2879,12 @@ msgid "C_ase Sensitive Search"
 msgstr "Rozlišov_at velká a malá písmena"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:260
-msgid "If you enable this option, the pattern will be searched in a case-sensitive manner. The default is to use a case-insensitive search."
-msgstr "Povolíte-li tuto volbu, budou se při hledání rozlišovat malá a velká písmena. Výchozí stav je nerozlišovat velikost písmen."
+msgid ""
+"If you enable this option, the pattern will be searched in a case-sensitive "
+"manner. The default is to use a case-insensitive search."
+msgstr ""
+"Povolíte-li tuto volbu, budou se při hledání rozlišovat malá a velká "
+"písmena. Výchozí stav je nerozlišovat velikost písmen."
 
 #. setup a tooltip with the error message
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:620
@@ -2846,8 +2911,15 @@ msgid "Send com_pressed"
 msgstr "Odeslat kom_primovaný"
 
 #: ../plugins/thunar-sendto-email/main.c:181
-msgid "When sending a file via email, you can either choose to send the file directly, as is, or compress the file before attaching it to an email. It is highly recommended to compress large files before sending them."
-msgstr "Při odesílání souboru elektronickou poštou můžete zvolit, zda má být soubor poslán v současné podobě, nebo zda má být zkomprimován před připojením do zprávy elektronické pošty. Doporučujeme velké soubory před odesláním vždy komprimovat."
+msgid ""
+"When sending a file via email, you can either choose to send the file "
+"directly, as is, or compress the file before attaching it to an email. It is "
+"highly recommended to compress large files before sending them."
+msgstr ""
+"Při odesílání souboru elektronickou poštou můžete zvolit, zda má být soubor "
+"poslán v současné podobě, nebo zda má být zkomprimován před připojením do "
+"zprávy elektronické pošty. Doporučujeme velké soubory před odesláním vždy "
+"komprimovat."
 
 #: ../plugins/thunar-sendto-email/main.c:192
 #, c-format
@@ -2862,8 +2934,16 @@ msgid "Send as _archive"
 msgstr "Poslat jako _archiv"
 
 #: ../plugins/thunar-sendto-email/main.c:200
-msgid "When sending multiple files via email, you can either choose to send the files directly, attaching multiple files to an email, or send all files compressed into a single archive file and attach the archive. It is highly recommended to send multiple large files as archive."
-msgstr "Při hromadném odesílání souborů elektronickou poštou můžete zvolit soubory přímo připojením více souborů do zprávy elektronické pošty nebo poslat všechny soubory zkomprimované v jednom archivu. Doporučujeme posílat více velkých souborů jako archiv."
+msgid ""
+"When sending multiple files via email, you can either choose to send the "
+"files directly, attaching multiple files to an email, or send all files "
+"compressed into a single archive file and attach the archive. It is highly "
+"recommended to send multiple large files as archive."
+msgstr ""
+"Při hromadném odesílání souborů elektronickou poštou můžete zvolit soubory "
+"přímo připojením více souborů do zprávy elektronické pošty nebo poslat "
+"všechny soubory zkomprimované v jednom archivu. Doporučujeme posílat více "
+"velkých souborů jako archiv."
 
 #. allocate the progress dialog
 #. setup the label
@@ -2979,53 +3059,72 @@ msgstr "Nepodařilo se uložit akci na disk."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Obecné"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Název:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Název akce, které se zobrazí v kontextové nabídce."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Popis:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
-msgid "The description of the action that will be displayed as tooltip in the statusbar when selecting the item from the context menu."
-msgstr "Popis akce, který se zobrazí jako tip ve stavovém řádku při vybrání této položky v kontextové nabídce."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
+msgid ""
+"The description of the action that will be displayed as tooltip in the "
+"statusbar when selecting the item from the context menu."
+msgstr ""
+"Popis akce, který se zobrazí jako tip ve stavovém řádku při vybrání této "
+"položky v kontextové nabídce."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "Pří_kaz:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
-msgid "The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, %D, %N) are used, the action will be applicable even if more than one item is selected. Else the action will only be applicable if exactly one item is selected."
-msgstr "Příkaz (včetně jeho nezbytných parametrů) k provedení akce. Legendu pro podporované parametry příkazů naleznete níže. Tyto parametry budou nahrazeny při spuštění příkazu. Použijete-li velká písmena (např. %F, %D, %N), akce bude spustitelná i při výběru více než jedné položky, jinak bude spustitelná jen při vybrání právě jedné položky."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
+msgid ""
+"The command (including the necessary parameters) to perform the action. See "
+"the command parameter legend below for a list of supported parameter "
+"variables, which will be substituted when launching the command. When upper-"
+"case letters (e.g. %F, %D, %N) are used, the action will be applicable even "
+"if more than one item is selected. Else the action will only be applicable "
+"if exactly one item is selected."
+msgstr ""
+"Příkaz (včetně jeho nezbytných parametrů) k provedení akce. Legendu pro "
+"podporované parametry příkazů naleznete níže. Tyto parametry budou nahrazeny "
+"při spuštění příkazu. Použijete-li velká písmena (např. %F, %D, %N), akce "
+"bude spustitelná i při výběru více než jedné položky, jinak bude spustitelná "
+"jen při vybrání právě jedné položky."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "Procházet systém souborů a vybrat aplikaci pro tuto akci."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Ikona:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Bez ikony"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
-msgid "Click this button to select an icon file that will be displayed in the context menu in addition to the action name chosen above."
-msgstr "Klikněte na toto tlačítko pro výběr ikony, která bude zobrazena v kontextové nabídce vedle názvu akce zvoleného výše."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
+msgid ""
+"Click this button to select an icon file that will be displayed in the "
+"context menu in addition to the action name chosen above."
+msgstr ""
+"Klikněte na toto tlačítko pro výběr ikony, která bude zobrazena v kontextové "
+"nabídce vedle názvu akce zvoleného výše."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3033,73 +3132,80 @@ msgstr ""
 "Následující parametry příkazu budou nahrazeny\n"
 "při spuštění akce:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "cesta k prvnímu vybranému souboru"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "cesty ke všem vybraným souborům"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "adresář, obsahující soubor, který je uveden v %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "adresáře, obsahující soubory, které jsou uvedeny v %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "první vybraný název souboru (bez cesty)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "vybrané názvy souborů (bez cest)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Podmínky zobrazení"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Maska souboru:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
-msgid "Enter a list of patterns that will be used to determine whether this action should be displayed for a selected file. If you specify more than one pattern here, the list items must be separated with semicolons (e.g. *.txt;*.doc)."
-msgstr "Zadejte seznam souborů, který bude použit pro určení, zda má být akce zobrazena pro vybraný soubor. Pokud upřesníte více než jednu masku, položky v seznamu musí být odděleny středníky (např. *.txt;*.doc)."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
+msgid ""
+"Enter a list of patterns that will be used to determine whether this action "
+"should be displayed for a selected file. If you specify more than one "
+"pattern here, the list items must be separated with semicolons (e.g. *.txt;*."
+"doc)."
+msgstr ""
+"Zadejte seznam souborů, který bude použit pro určení, zda má být akce "
+"zobrazena pro vybraný soubor. Pokud upřesníte více než jednu masku, položky "
+"v seznamu musí být odděleny středníky (např. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Objeví se, pokud výběr obsahuje:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Adresáře"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Zvukové soubory"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Obrázky"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Textové dokumenty"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Videa"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Jiné soubory"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3121,8 +3227,10 @@ msgstr ""
 "ře. Dále můžete určit akci, která by se měla objevit jen pro\n"
 "určitý druh souborů."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Vyberte ikonu"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
@@ -3152,8 +3260,11 @@ msgid "Configure c_ustom actions..."
 msgstr "Konfig_urovat vlastní akce..."
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:189
-msgid "Setup custom actions that will appear in the file managers context menus"
-msgstr "Nastaví vlastní akce, které se objeví v kontextových nabídkách správců souborů"
+msgid ""
+"Setup custom actions that will appear in the file managers context menus"
+msgstr ""
+"Nastaví vlastní akce, které se objeví v kontextových nabídkách správců "
+"souborů"
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:406
 #, c-format
@@ -3194,10 +3305,12 @@ msgstr "Otevřít specifikované adresáře aplikací Thunar"
 
 #~ msgid "Failed to determine file info of \"%s\": %s"
 #~ msgstr "Nezdařilo se získat informace o souboru \"%s\": %s"
+
 #~ msgid ""
 #~ "The file \"%s\" already exists. Do you want to replace it with an empty "
 #~ "file?"
 #~ msgstr "Soubor \"%s\" již existuje. Chcete jej nahradit prázdným souborem?"
+
 #~ msgid ""
 #~ "Failed to remove \"%s\".\n"
 #~ "\n"
@@ -3206,6 +3319,7 @@ msgstr "Otevřít specifikované adresáře aplikací Thunar"
 #~ "Nepodařilo se odstranit soubor \"%s\".\n"
 #~ "\n"
 #~ "Chcete jej přeskočit?"
+
 #~ msgid ""
 #~ "Failed to create empty file \"%s\".\n"
 #~ "\n"
@@ -3214,28 +3328,37 @@ msgstr "Otevřít specifikované adresáře aplikací Thunar"
 #~ "Nepodařilo se vytvořit prázdný soubor \"%s\".\n"
 #~ "\n"
 #~ "Chcete jej přeskočit?"
+
 #~ msgid "Failed to stat file \"%s\": %s"
 #~ msgstr ""
 #~ "Nezdařilo se získat informace o stavu souboru \"%s\" příkazem stat: %s"
+
 #~ msgid "Failed to create directory \"%s\": %s"
 #~ msgstr "Nezdařilo se vytvořit adresář \"%s\": %s"
+
 #~ msgid "Deleting directories..."
 #~ msgstr "Mažu adresáře..."
+
 #~ msgid "Failed to remove directory \"%s\": %s"
 #~ msgstr "Nezdařilo se odstranit adresář \"%s\": %s"
+
 #~ msgid "Cannot transfer the root directory"
 #~ msgstr "Nelze přenést kořenový adresář"
+
 #~ msgid "Operation canceled"
 #~ msgstr "Operace byla zrušena"
+
 #~ msgid "Failed to read link target from \"%s\""
 #~ msgstr "Nezdařilo se načíst cíl odkazu z \"%s\""
+
 #~ msgid "Failed to change mode of \"%s\""
 #~ msgstr "Nezdařilo se změnit mód souboru \"%s\""
+
 #~ msgid "Failed to copy special file \"%s\""
 #~ msgstr "Nezdařilo se zkopírovat speciální soubor \"%s\""
+
 #~ msgid "Delete the selected file permanently"
 #~ msgid_plural "Delete the selected files permanently"
 #~ msgstr[0] "Neobnovitelně smaže vybraný soubor"
 #~ msgstr[1] "Neobnovitelně smaže vybrané soubory"
 #~ msgstr[2] "Neobnovitelně smaže vybrané soubory"
-
diff --git a/po/de.po b/po/de.po
index dd2f8b45a4d216d4a4f027ed0b4f68cfe6f6afee..d06d3e010f9d79352556e304eb3deed7e9bda3ec 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
-"PO-Revision-Date: 2006-08-13 00:41+0100\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
+"PO-Revision-Date: 2006-08-26 17:11+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -709,39 +709,38 @@ msgstr ""
 "wurden."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Anwendung auswählen"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Alle Dateien"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Ausführbare Dateien"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl Skripte"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python Skripte"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby Skripte"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell Skripte"
 
@@ -839,6 +838,7 @@ msgstr "Listenspalten automatisch ver_größern"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -1007,7 +1007,7 @@ msgstr "Vorwärts"
 msgid "Go to the next visited folder"
 msgstr "Zum nächsten besuchten Ort gehen"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1908,7 +1908,6 @@ msgid "Audio Files"
 msgstr "Audiodateien"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Bilddateien"
 
@@ -3077,23 +3076,23 @@ msgstr "Die benutzerdefinierten Aktionen konnten nicht gespeichert werden."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Allgemein"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Der Name der Aktion, der im Kontextmenü dargestellt werden soll."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3101,11 +3100,11 @@ msgstr ""
 "Die Beschreibung dieser Aktion wird als Erklärung in der Statusleiste "
 "angezeigt, wenn die Aktion im Kontextmenü ausgewählt wird."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Befehl:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3121,22 +3120,22 @@ msgstr ""
 "ausgewählt sind. Ansonsten kann die Anwendung nur auf eine einzelne Datei "
 "angewandt werden."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Das Dateisystem durchsuchen, um eine Anwendung für diese Aktion auszuwählen."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Symbol:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Kein Symbol"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3144,7 +3143,7 @@ msgstr ""
 "Auf diesen Knopf klicken, um ein Dateisymbol auszuwählen, das im "
 "Kontextmenü  zusätzlich zum oben angegebenen Namen angezeigt wird."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3152,41 +3151,41 @@ msgstr ""
 "Die folgenden Befehlsparameter werden ersetzt,\n"
 "wenn die Aktion ausgeführt wird:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "Pfad zur ersten ausgewählten Datei"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "Pfade zu allen ausgewählten Dateien"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "Ordner der ersten ausgewählten Datei (aus »%f«)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "Ordner aller ausgewählten Dateien (aus »%F«)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "Der erste ausgewählte Dateiname (ohne Pfad)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "Die ausgewählten Dateinamen (ohne Pfade)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Dateizuordnung"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "Datei_muster:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3198,35 +3197,35 @@ msgstr ""
 "Falls Sie mehrere Muster angeben, müssen die Elemente mit Strichpunkten "
 "getrennt werden (z.B. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Erscheint, falls ausgewählt:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Ordner"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Audiodateien"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Bilddateien"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Textdateien"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Videodateien"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "A_ndere Dateien"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3250,9 +3249,11 @@ msgstr ""
 "Weiterhin kann angegeben werden, dass eine Aktion\n"
 "nur für bestimmte Dateitypen erscheinen soll."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
-msgstr "Symbol auswählen"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, c-format
+msgid "Select an Icon for \"%s\""
+msgstr "Symbol für »%s« auswählen"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
 #, c-format
diff --git a/po/el.po b/po/el.po
index 9a25caa793cf4d2fdd08d8a1fae6874517b119f7..aee2c7278d18803fbd91173db9c0e668a63e0616 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-02 23:21+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -708,39 +708,38 @@ msgstr ""
 "προσαρμοσμένης εντολής του διαλόγου \"Άνοιγμα με\" του διαχειριστή αρχείων."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Επιλογή εφαρμογής"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Εκτελέσιμα αρχεία"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Δέσμες ενεργειών Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Δέσμες ενεργειών Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Δέσμες ενεργειών Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Δέσμες ενεργειών κέλυφους"
 
@@ -836,6 +835,7 @@ msgstr "Αυτόματη _επέκταση στηλών"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Άγνωστο"
 
@@ -1005,7 +1005,7 @@ msgstr "Εμπρός"
 msgid "Go to the next visited folder"
 msgstr "Μετάβαση στον επόμενο φάκελο που επισκεφτήκατε"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1897,7 +1897,6 @@ msgid "Audio Files"
 msgstr "Αρχεία ήχου"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
@@ -3064,23 +3063,23 @@ msgstr "Η αποθήκευση των ενεργειών στο δίσκο απ
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Βασικό"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Το όνομα της ενέργειας που θα εμφανίζεται στο μενού ενεργειών."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Περιγραφή:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3088,11 +3087,11 @@ msgstr ""
 "Η περιγραφή της ενέργειας που θα εμφανίζεται σαν κειμενάκι βοήθειας στην "
 "μπάρα κατάστασης κατά την επιλογή του αντικειμένου από το μενού ενεργειών."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Εντολή:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3108,23 +3107,23 @@ msgstr ""
 "παραπάνω από ένα αντικείμενα επιλεγμένα. Αλλιώς η δράση θα εμφανίζεται μόνο "
 "όταν είναι επιλεγμένο ένα μόνο αντικείμενο."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Ερευνήστε το σύστημα αρχείων για να επιλέξετε την εφαρμογή που θα "
 "χρησιμοποιείτε για αυτή την ενέργεια."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "Εικονίδ_ιο:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Χωρίς εικονίδιο"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3132,7 +3131,7 @@ msgstr ""
 "Πιέστε αυτό το κουμπί για να επιλέξετε το εικονίδιο που θα εμφανίζεται στο "
 "μενού δίπλα από το όνομα της ενέργειας."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3140,41 +3139,41 @@ msgstr ""
 "Οι παρακάτω παράμετροι θα μεταβιβαστούν\n"
 "στην εντολή κατά την εκτέλεσή της:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "η διαδρομή προς το πρώτο επιλεγμένο αρχείο"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "οι διαδρομές προς όλα τα επιλεγμένα αρχεία"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "ο κατάλογος που περιέχει το αρχείο στην %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "οι κατάλογοι που περιέχουν τα αρχεία στην %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "το πρώτο επιλεγμένο αρχείο (χωρίς τη διαδρομή του)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "τα επιλεγμένα αρχεία (χωρίς τις διαδρομές)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Συνθήκες εμφάνισης"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Μοτίβο:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3186,35 +3185,35 @@ msgstr ""
 "από μια μάσκα εδώ, τα αντικείμενα στη λίστα θα πρέπει να χωρίζονται με "
 "ερωτηματικά (π.χ. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Εμφανίζεται εάν η επιλογή περιέχει:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "Κατάλο_γοι"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "Αρχεία _ήχου"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Αρχεία ε_ικόνας"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Αρχεία _κειμένου"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Αρχεία _βίντεο"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Άλλα αρχεία"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3238,8 +3237,10 @@ msgstr ""
 "ότι η ενέργεια μπορεί να εμφανίζεται μόνο για ορισμένα\n"
 "είδη αρχείων."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Επιλογή εικονιδίου"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/eo.po b/po/eo.po
index 4dbb1a7237841da7ea508a3d4c66a66e95862e7f..4b212116f19882602a0bcf301b2dd6273c43e580 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-07-20 22:42+0200\n"
 "Last-Translator: Antono Vasiljev <antono.vasiljev@gmail.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -711,39 +711,38 @@ msgstr ""
 "per\" dialogo de la dosier-administrilo."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Selektu aplikaĵon"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Lanĉeblaj dosieroj"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl skriptoj"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python skriptoj"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby skriptoj"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell skriptoj"
 
@@ -837,6 +836,7 @@ msgstr "AÅ­tomat_e pligrandigu kolonetojn kiel necese"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Nekonata"
 
@@ -1004,7 +1004,7 @@ msgstr "AntaÅ­en"
 msgid "Go to the next visited folder"
 msgstr "Iru al la sekva vizitita dosierujo"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr "Ne eblas ŝarĝigi emblemeton el \"%s\" (%s). Kontrolu vian instalaĵon!"
@@ -1880,7 +1880,6 @@ msgid "Audio Files"
 msgstr "AÅ­deblaj Dosieroj"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
@@ -3032,23 +3031,23 @@ msgstr "Malsukcesis savi agojn al dosiero."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Simpla"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nomo:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "La nomo de la ago kiu estos montrita en ĉirkaŭteksta menuo."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Priskribo:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3056,11 +3055,11 @@ msgstr ""
 "La priskribo de la ago, montrota kiel konsilo kiam vi elektos la agon en la "
 "kunteksta menuo."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Komando:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3076,22 +3075,22 @@ msgstr ""
 "estos elektita. En alia okazo la ago aperos nur se nur unu dosiero estos "
 "elektita. "
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Rigardu tra la dosier-sistemo por trovi aplikaĵon per kiu farota ti ĉiu ago."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "P_iktogramo:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Mankas piktogramo"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3099,7 +3098,7 @@ msgstr ""
 "Klaku ĉi tiun butonon por elekti piktogramon, kiu aperas apud la ago-nomo en "
 "la kunteksta menuo."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3107,41 +3106,41 @@ msgstr ""
 "La sekvantaj parametroj de programo estos uzataj\n"
 "kiam vi ekvolos lanĉi la agon:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "la vojo al la unua selektita dosiero"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "la vojoj al ĉiuj selektitaj dosieroj"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "dosierujo enhavanta la dosieron, kiu kongruas kun %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "dosierujoj enhavanta la dosierojn, kiuj kongruas kun %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "la unua selektita dosiernomo (sen vojo)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "la selektitaj dosier-nomoj (sen vojoj)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Kondiĉoj de apero"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Dosiera ŝablono:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3152,35 +3151,35 @@ msgstr ""
 "elektita dosiero. Se vi skribas ĉi tie plurajn ŝablonojn, bonvolu apartigi "
 "ilin per punktokomoj (ekz. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Aperos nur se selektaĵo enhavos:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Dosierujoj"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Audeblaj dosieroj"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "B_ildaj dosieroj"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Tekstaj dosieroj"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Vidaĵ-dosieroj"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "Aliaj d_osieroj"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3202,8 +3201,10 @@ msgstr ""
 "almenaÅ­ unu regula esprimo el la listo. Plie, vi povas\n"
 "specifi ke la ago aperu nur por difinitaj dosier-tipoj."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Selektu piktogramon"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/es.po b/po/es.po
index 18d7169d55d80801f283392ed7e2a80eed8eb79b..f08e02fae9283b501ca8c56b3fc3a502c289b9de 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-05-04 14:12+0000\n"
 "Last-Translator: Daniel Fuertes Pérez (DaniFP) <danifp25@yahoo.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -712,39 +712,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Seleccionar una Aplicación"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Todos los Archivos"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Archivos Ejecutables"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Scripts de Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Scripts en Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Scripts en Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Scripts de Shell"
 
@@ -840,6 +839,7 @@ msgstr "_Expandir automáticamente las columnas según se requiera"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1006,7 +1006,7 @@ msgstr "Avanzar"
 msgid "Go to the next visited folder"
 msgstr "Ir a la siguiente carpeta visitada"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1895,7 +1895,6 @@ msgid "Audio Files"
 msgstr "Ficheros de Sonido"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Ficheros de Imagen"
 
@@ -3065,23 +3064,23 @@ msgstr "No se pudo guardar las acciones al disco."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Básico"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "El nombre de la acción, que será mostrado en el menú contextual."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Descripción:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3089,11 +3088,11 @@ msgstr ""
 "Mensaje descrivo de la acción, que será mostrado en la barra de estado "
 "cuando seleccione un elemento desde el menú contextual."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Orden:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3109,23 +3108,23 @@ msgstr ""
 "seleccionan varios elementos. En caso de usar minúsculas, la acción sólo se "
 "ejecutará si se selecciona exáctamente un elemento."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Explorar el sistema de ficheros para elegir una aplicación a usar para esta "
 "acción."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Icono"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Sin icono"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3133,7 +3132,7 @@ msgstr ""
 "Pulsa este botón para elegir un icono que se mostrará en el menú contextual "
 "además del nombre de la acción escogida antes."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3141,41 +3140,41 @@ msgstr ""
 "Los siguientes parámetros serán sustituídos\n"
 "al ejecutar la acción:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "la ruta al primer fichero seleccionado"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "las rutas de todos los ficheros seleccionados"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "directorio contenedor del fichero indicado en %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "directorios contenedores de los ficheros indicados en %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "el primer nombre de fichero seleccionado (sin la ruta)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "los nombres de ficheros seleccionados (sin las rutas)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Condiciones de Aparición"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "Patrón de _Fichero:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3187,35 +3186,35 @@ msgstr ""
 "la lista de elementos debe usar punto y coma como separadores (p.e: *.txt;*."
 "doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Aparece si la selección contiene:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Directorios"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "Ficheros de _Audio"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Ficheros de _Imagen"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Ficheros de _Texto"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Ficheros de _Video"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Otros Ficheros"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3238,8 +3237,10 @@ msgstr ""
 "fichero o directorio. Además, puede especificar que la\n"
 "acción sólo deba aparecer para ciertos tipos de ficheros."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Escoja un Icono"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/et.po b/po/et.po
index fcac975109bcfa7a744e215445f82f87e80a80ff..d55c4d21b3544a516b005137d8bf456cf7834d35 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-04-18 16:37+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@proekspert.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -709,39 +709,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Vali rakendus"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Kõik failid"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Käivitatavad failid"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perli skriptid"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Pythoni skriptid"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby skriptid"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shelli skriptid"
 
@@ -836,6 +835,7 @@ msgstr "Vajadusel suurenda tulpasid automaatselt"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -1001,7 +1001,7 @@ msgstr "Edasi"
 msgid "Go to the next visited folder"
 msgstr "Mine järgmisele viidatud kataloogile"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1888,7 +1888,6 @@ msgid "Audio Files"
 msgstr "Helifailid"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Pildi failid"
 
@@ -3042,23 +3041,23 @@ msgstr "Tegevuste salvestamine kettale läks nässu."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Põhiline"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Tegevuse nimi, mida näidatakse kontekstimenüüs."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Kirjeldus:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3066,11 +3065,11 @@ msgstr ""
 "Tegevuse kirjeldus, mida näidatakse kui selgitust olekuribalkui tehakse "
 "valitakut konteksti menüüst."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Käsklus:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3085,21 +3084,21 @@ msgstr ""
 "%F, %D ja %N on kasutusel, siis tegevuson rakendatav isegi siis kui rohkem "
 "kui üks asi on valitud. Muidu on tegevus rakendatavainult ühe asja valikul."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "Sirvi failisüsteemi, et valida rakendus sellele tegevusele."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Ikoon:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Pole ikooni"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3107,7 +3106,7 @@ msgstr ""
 "Toksa sellel nupul, et valida ikooni faili mida näidatakse kontekstimenüüs "
 "lisaks ülalvalitud tegevuse nimele."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3115,41 +3114,41 @@ msgstr ""
 "Järgnevad käsu parameetrid asendatakase\n"
 "tegevuse käivitamisel:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "teekond esimese valitud faili juurde"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "teekonnad kõigi valitud failide juurde"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "kataloog, mis sisaldab faili, asendatakse kohal %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "kataloogid, mis sisaldavad faile, asendatakse kohal %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "esimene falitud faili nimi ilma teekonnata"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "valitud faili nimed ilma teekonnata"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Esinemise tingimused"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Faili kirjeldus:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3161,35 +3160,35 @@ msgstr ""
 "kirjelduse, siis nimekiri peab olema eraldatud semikoolonitega (näiteks *."
 "txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Ilmub kui valik sisaldab:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Katalooge"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Helifailde"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Pildifaile"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Textifaile"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Videofaile"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Teisi faile"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3211,8 +3210,10 @@ msgstr ""
 "nimega. Täiendavalt sa saad määrata, et tegevus\n"
 "ilmub ainult konkreetsete failitüüpide korral."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Vali ikoon"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/eu.po b/po/eu.po
index 857683ac4b40eccd7e482a8265f1aab45cad0272..11e4ea13ddb33e573344fbe8e2f24450b962ae8a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-15 23:06+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -609,7 +609,8 @@ msgstr "Ez da aplikaziorik hautatu"
 
 #: ../thunar/thunar-chooser-button.c:366
 #, c-format
-msgid "The selected application is used to open this and other files of type \"%s\"."
+msgid ""
+"The selected application is used to open this and other files of type \"%s\"."
 msgstr ""
 "Hautaturiko aplikazioa fitxategi hau eta \"%s\" motakoak irekitzeko "
 "erabiltzen da."
@@ -671,7 +672,8 @@ msgstr "<i>%s</i> eta \"%s\" motako fitxategiak honekin ireki:"
 
 #: ../thunar/thunar-chooser-dialog.c:713
 #, c-format
-msgid "Browse the file system to select an application to open files of type \"%s\"."
+msgid ""
+"Browse the file system to select an application to open files of type \"%s\"."
 msgstr ""
 " \"%s\" motako fitxategiak irekitzeko aplikazioa hautatzeko fitxategi "
 "sistema arakatu."
@@ -705,39 +707,38 @@ msgstr ""
 "pertsonalizatutako  aplikazio abiarazleak ezaba ditzakezu."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Aplikazio bat hautatu"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Fitxategi Guztiak"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Fitxategi Exekutagarriak"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl Skript-ak"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python Skript-ak"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby Skript-ak"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell Skript-ak"
 
@@ -834,6 +835,7 @@ msgstr "Automatikoki _zabaldu zutabeak behar denean"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -997,7 +999,7 @@ msgstr "Aurrera"
 msgid "Go to the next visited folder"
 msgstr "Hurrengo karpetara joan"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1264,7 +1266,8 @@ msgstr "Zakarrontziko fitxategi eta karpeta guztiak ezabatu"
 #. add the "Paste Into Folder" action
 #: ../thunar/thunar-location-buttons.c:1280
 #, c-format
-msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into \"%s\""
 msgstr ""
 "Moztu edo Kopiatu komandoaz aurretik hautaturiko fitxategiak  \"%s\" barnera "
 "mugitu edo kopiatu"
@@ -1846,7 +1849,8 @@ msgid "_Rename Files"
 msgstr "Fitxategiak Be_rrizendatu"
 
 #: ../thunar/thunar-renamer-dialog.c:371
-msgid "Click here to actually rename the files listed above to their new names."
+msgid ""
+"Click here to actually rename the files listed above to their new names."
 msgstr ""
 "Hemen klik egin behean zerrendaturiko fitxategiak izen berrietara orain "
 "berrizendatzeko."
@@ -1884,7 +1888,6 @@ msgid "Audio Files"
 msgstr "Audio Fitxategiak"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Irudi Fitxategiak"
 
@@ -1915,8 +1918,10 @@ msgstr[1] "Fitxategiak Ezabatu"
 #: ../thunar/thunar-renamer-dialog.c:1551
 msgid "Remove the selected file from the list of files to be renamed"
 msgid_plural "Remove the selected files from the list of files to be renamed"
-msgstr[0] "Ezabatu hautaturiko fitxategia berrizendatzeko fitxategi zerrendatik"
-msgstr[1] "Ezabatu hautaturiko fitxategiak berrizendatzeko fitxategi zerrendatik"
+msgstr[0] ""
+"Ezabatu hautaturiko fitxategia berrizendatzeko fitxategi zerrendatik"
+msgstr[1] ""
+"Ezabatu hautaturiko fitxategiak berrizendatzeko fitxategi zerrendatik"
 
 #. change title to reflect the standalone status
 #: ../thunar/thunar-renamer-dialog.c:1702
@@ -1948,7 +1953,8 @@ msgid "_Skip This File"
 msgstr "Fitxategi hau albo batera ut_zi"
 
 #: ../thunar/thunar-renamer-progress.c:233
-msgid "Do you want to skip this file and continue to rename the remaining files?"
+msgid ""
+"Do you want to skip this file and continue to rename the remaining files?"
 msgstr ""
 "Fitxategi hau albo batera utzi eta besteak berrizendatzen jarraitu nahi al "
 "duzu?"
@@ -2193,7 +2199,8 @@ msgstr[1] "Hautatutako fitxategiak itsatsi komandoaz mugitzeko prestatu"
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] "Hautatutako fitxategia itsatsi komando bitartez kopiatzeko prestatu"
-msgstr[1] "Hautatutako fitxategiak itsatsi komando bitartez kopiatzeko prestatu"
+msgstr[1] ""
+"Hautatutako fitxategiak itsatsi komando bitartez kopiatzeko prestatu"
 
 #: ../thunar/thunar-standard-view.c:3350
 msgid "Delete the selected file"
@@ -2493,7 +2500,8 @@ msgstr "Txantiloiei buruz"
 
 #: ../thunar/thunar-window.c:1749
 msgid "All files in this folder will appear in the \"Create Document\" menu."
-msgstr "Karpeta honetako fitxategi guztiak \"Dokumentua Sortu\" menuan agertuko dira."
+msgstr ""
+"Karpeta honetako fitxategi guztiak \"Dokumentua Sortu\" menuan agertuko dira."
 
 #: ../thunar/thunar-window.c:1756
 msgid ""
@@ -2571,7 +2579,8 @@ msgstr "Azalpena:"
 msgid ""
 "The generic name of the entry, for example \"Web Browser\" in case of "
 "Firefox."
-msgstr "Sarreraren izen arrunta, adibidez \"Web Nabigatzailea\" Firefox-en kasuan."
+msgstr ""
+"Sarreraren izen arrunta, adibidez \"Web Nabigatzailea\" Firefox-en kasuan."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
 msgid "Command:"
@@ -2847,7 +2856,8 @@ msgid "Replace _With:"
 msgstr "Honengatik A_ldatu:"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:246
-msgid "Enter the text that should be used as replacement for the pattern above."
+msgid ""
+"Enter the text that should be used as replacement for the pattern above."
 msgstr "Aurreko patroia aldatzeko erabiliko den testua idatzi."
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:258
@@ -3031,23 +3041,23 @@ msgstr "Huts ekintzak diskoan gordetzerakoan."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Kontestu menuan bistaraziko den ekintzaren izena."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Azalpena:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3055,11 +3065,11 @@ msgstr ""
 "Elementua kontestu menutik aukeratzerakoan egoera barran argibide bezala "
 "agertuko den ekintzaren azalpena."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_komandoa:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3075,21 +3085,22 @@ msgstr ""
 "hautatuak egon. Bestela ekintza elementu bat bakarrik aukeraturik dagoenean "
 "abiaraziko da."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
-msgstr "Ekintza honetan erabiltzeko aplikazioa hautatzeko fitxategi sistema arakatu."
+msgstr ""
+"Ekintza honetan erabiltzeko aplikazioa hautatzeko fitxategi sistema arakatu."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Ikonoa:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Ikonorik Ez"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3097,7 +3108,7 @@ msgstr ""
 "Botoi honetan klik egin kontestu menuan ekintza izenaz gai bistaraziko den "
 "ikono fitxategia hautatzeko."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3105,41 +3116,41 @@ msgstr ""
 "Honako komando parametro hauek aldatuak\n"
 "izango dira ekintza abiaraztean:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "lehen aukeratutako fitxategiaren bidea"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "aukeratutako fitxategi guztien bidea"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "%f-n pasa den fitxategia duen direktorioa"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "%F-en pasa diren fitxategiak dituzten direktorioak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "lehen aukeratutako fitxategi izena (bidearekin)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "hautatutako fitxategi izenak (biderik gabe)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Itxura Egoera"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Fitxategi Patroia:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3150,35 +3161,35 @@ msgstr ""
 "zerrenda. Hemen patroi bat baino gehiago aukeratu ezkero zerrendako "
 "elementuak puntu eta komaz bereizirik ipini behar dira (adib. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Hautapenak hau duenean agertuko da:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Direktorioak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Audio Fitxategiak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Irudi Fitxategiak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Testu Fitxategiak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Bideo Fitxategiak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "Bestelak_o Fitxategiak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3201,8 +3212,10 @@ msgstr ""
 " gain ekintza fitxategi mota batzuetan bakarrik agertzea\n"
 " zehaztu dezakezu."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Ikono bat Hautatu"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
@@ -3232,7 +3245,8 @@ msgid "Configure c_ustom actions..."
 msgstr "E_kintza pertsonalizatuak konfiguratu..."
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:189
-msgid "Setup custom actions that will appear in the file managers context menus"
+msgid ""
+"Setup custom actions that will appear in the file managers context menus"
 msgstr "Kontestu menuetan agertuko diren ekintza pertsonalizatuak konfiguratu"
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:406
@@ -3271,4 +3285,3 @@ msgstr "Karpeta Ireki Thunar-ekin"
 #: ../Thunar-folder-handler.desktop.in.in.h:3
 msgid "Open the specified folders in Thunar"
 msgstr "Hautatutako direktorioak thunar-en ireki"
-
diff --git a/po/fi.po b/po/fi.po
index 14f61d7231be5962a2a764703388b4a18601af83..7a34320acc14336a5a399f0ff83403f4dd4bada1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-17 11:42+0300\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-17 11:42+0300\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -704,39 +704,38 @@ msgstr ""
 "\"Avaa sovelluksessa\" -dialogin mukautettu komento -laatikon avulla."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Valitse sovellus"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Suoritettavat tiedostot"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl-skriptit"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python-skriptit"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby-skriptit"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell-skriptit"
 
@@ -833,6 +832,7 @@ msgstr "_Laajenna sarakkeet automaattisesti tarvittaessa"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -996,7 +996,7 @@ msgstr "Seuraava"
 msgid "Go to the next visited folder"
 msgstr "Siirry seuraavaan hakemistoon"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1880,7 +1880,6 @@ msgid "Audio Files"
 msgstr "Äänitiedostot"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
@@ -3027,23 +3026,23 @@ msgstr "Toimintojen tallentaminen epäonnistui."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Perustiedot"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Kontekstivalikossa näytettävä toiminnon nimi."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Kuvaus:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3051,11 +3050,11 @@ msgstr ""
 "Toiminnon kuvaus, joka näytetään työkaluvihjeenä tilapalkissa valittaessa "
 "kohdetta kontekstivalikosta."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Komento:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3071,21 +3070,21 @@ msgstr ""
 "valittuna. Muussa tapauksessa toiminto on käytettävissä silloin, kun "
 "valittuna on ainoastaan yksi tiedosto."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "Selaa tiedostojärjestelmää valitaksesi sovelluksen toiminnolle."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Kuvake:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Ei kuvaketta"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3093,7 +3092,7 @@ msgstr ""
 "Napsauta tätä painiketta valitaksesi kuvaketiedoston, joka näytetään "
 "kontekstivalikossa toiminnon nimen lisäksi."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3101,41 +3100,41 @@ msgstr ""
 "Seuraavat komennon määreet korvataan\n"
 "toimintoa suoritettaessa:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "polku ensimmäiseen valittuun tiedostoon"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "polut kaikkiin valittuihin tiedostoihin"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "hakemisto, jossa muuttujan %f osoittama tiedosto sijaitsee"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "hakemistot, joissa muuttujan %F osoittamat tiedostot sijaitsevat"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "ensimmäisen valitun tiedoston nimi (ilman polkua)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "valittujen tiedostojen nimet (ilman polkuja)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Näkyvyysehdot"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Tiedostokaava:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3146,35 +3145,35 @@ msgstr ""
 "näyttää valitulle tiedostolle. Jos määrität useamman kuin yhden kaavan, "
 "listan erottimena käytetään puolipistettä (esim. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Näytetään, jos valittuna on:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Hakemistoja"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Äänitiedostoja"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Kuvatiedostoja"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Tekstitiedostoja"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Videotiedostoja"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Muita tiedostoja"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3197,8 +3196,10 @@ msgstr ""
 "kansion nimeä. Lisäksi voit määrittää toiminnon\n"
 "näkymään ainoastaan tietyille tiedostotyypeille"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Valitse kuvake"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/fr.po b/po/fr.po
index 6d1f109115e84f60092cb01a8a46109515614393..c257eca1d1ffbe2579ad862c9831c7ed0d3f3815 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-19 16:28+0100\n"
 "Last-Translator: Maximilian Schleiss <maxschleiss@bluewin.ch>\n"
 "Language-Team: French <xfce-i18n@xfce.org>\n"
@@ -36,8 +36,7 @@ msgstr "Aucun champ Exec spécifié"
 msgid "No URL field specified"
 msgstr "Aucune URL spécifiée"
 
-#: ../thunar-vfs/thunar-vfs-info.c:362
-#: ../thunar-vfs/thunar-vfs-io-local.c:870
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:870
 msgid "Invalid desktop file"
 msgstr "Fichier de bureau invalide"
 
@@ -106,8 +105,7 @@ msgstr "Échec à l'écriture de données vers \"%s\""
 #. display an error to the user
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:234
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:297
-#: ../thunar-vfs/thunar-vfs-io-ops.c:496
-#: ../thunar/thunar-chooser-dialog.c:787
+#: ../thunar-vfs/thunar-vfs-io-ops.c:496 ../thunar/thunar-chooser-dialog.c:787
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Échec à la suppression de \"%s\""
@@ -123,8 +121,7 @@ msgid "copy of %s"
 msgstr "copie de %s"
 
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
-#: ../thunar/thunar-list-model.c:777
-#: ../thunar/thunar-properties-dialog.c:762
+#: ../thunar/thunar-list-model.c:777 ../thunar/thunar-properties-dialog.c:762
 #, c-format
 msgid "link to %s"
 msgstr "lien vers %s"
@@ -226,7 +223,9 @@ msgstr "Échec au déplacement de \"%s\" vers \"%s\""
 #: ../thunar-vfs/thunar-vfs-io-trash.c:601
 #, c-format
 msgid "The URI \"%s\" does not refer to a valid resource in the trash"
-msgstr "Le chemin \"%s\" ne fait pas référence à une ressource valide dans la corbeille"
+msgstr ""
+"Le chemin \"%s\" ne fait pas référence à une ressource valide dans la "
+"corbeille"
 
 #: ../thunar-vfs/thunar-vfs-io-trash.c:778
 msgid "Trash"
@@ -283,8 +282,7 @@ msgid "The icon of the mime handler"
 msgstr "L'icône du gestionnaire des types de fichier"
 
 #: ../thunar-vfs/thunar-vfs-mime-handler.c:174
-#: ../thunar/thunar-enum-types.c:94
-#: ../thunar/thunar-renamer-dialog.c:427
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:427
 #: ../thunarx/thunarx-renamer.c:177
 msgid "Name"
 msgstr "Nom"
@@ -320,8 +318,7 @@ msgstr "Opération non supportée"
 msgid "Invalidly escaped characters"
 msgstr "Caractères d'échappement invalides"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:222
-#: ../thunar/thunar-enum-types.c:97
+#: ../thunar-vfs/thunar-vfs-thumb.c:222 ../thunar/thunar-enum-types.c:97
 msgid "Size"
 msgstr "Taille"
 
@@ -469,8 +466,7 @@ msgid "Sort items in descending order"
 msgstr "Trier les éléments par ordre décroissant"
 
 #. display an error message to the user
-#: ../thunar/thunar-application.c:361
-#: ../thunar/thunar-application.c:405
+#: ../thunar/thunar-application.c:361 ../thunar/thunar-application.c:405
 msgid "Failed to launch operation"
 msgstr "Échec au lancement de l'opération"
 
@@ -485,8 +481,7 @@ msgstr "Échec à l'ouverture de \"%s\""
 msgid "Failed to open \"%s\": %s"
 msgstr "Échec à l'ouverture de \"%s\" : %s"
 
-#: ../thunar/thunar-application.c:907
-#: ../thunar/thunar-application.c:940
+#: ../thunar/thunar-application.c:907 ../thunar/thunar-application.c:940
 msgid "Copying files..."
 msgstr "Copie des fichiers..."
 
@@ -551,15 +546,18 @@ msgstr "Supprimer tous les fichiers et dossiers dans la corbeille?"
 #. add the "Empty Trash" menu item
 #: ../thunar/thunar-application.c:1269
 #: ../thunar/thunar-location-buttons.c:1265
-#: ../thunar/thunar-shortcuts-view.c:855
-#: ../thunar/thunar-tree-view.c:1076
+#: ../thunar/thunar-shortcuts-view.c:855 ../thunar/thunar-tree-view.c:1076
 #: ../plugins/thunar-tpa/main.c:49
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
 #: ../thunar/thunar-application.c:1273
-msgid "If you choose to empty the Trash, all items in it will be permanently lost. Please note that you can also delete them separately."
-msgstr "Vider la corbeille supprimera définitivement tous les éléments s'y trouvant. Ces derniers peuvent être effacés séparément."
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Vider la corbeille supprimera définitivement tous les éléments s'y trouvant. "
+"Ces derniers peuvent être effacés séparément."
 
 #: ../thunar/thunar-application.c:1290
 msgid "Emptying the Trash..."
@@ -581,8 +579,13 @@ msgstr "C_réer dossier"
 
 #: ../thunar/thunar-application.c:1382
 #, c-format
-msgid "The folder \"%s\" does not exist anymore, but it is required to restore the file \"%s\" from the trash. Do you want to create the folder again?"
-msgstr "Le dossier \"%s\" n'existe plus, il est néanmoins nécessaire à la restauration du fichier \"%s\" de la corbeille. Voulez-vous recréer le dossier?"
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+"Le dossier \"%s\" n'existe plus, il est néanmoins nécessaire à la "
+"restauration du fichier \"%s\" de la corbeille. Voulez-vous recréer le "
+"dossier?"
 
 #. display an error dialog
 #: ../thunar/thunar-application.c:1419
@@ -596,8 +599,7 @@ msgstr "Restauration des fichiers..."
 
 #. tell the user that it didn't work
 #. display an error to the user
-#: ../thunar/thunar-chooser-button.c:275
-#: ../thunar/thunar-chooser-dialog.c:506
+#: ../thunar/thunar-chooser-button.c:275 ../thunar/thunar-chooser-dialog.c:506
 #, c-format
 msgid "Failed to set default application for \"%s\""
 msgstr "Échec à l'affectation de l'application par défaut de \"%s\""
@@ -608,16 +610,18 @@ msgstr "Aucune application sélectionnée"
 
 #: ../thunar/thunar-chooser-button.c:366
 #, c-format
-msgid "The selected application is used to open this and other files of type \"%s\"."
-msgstr "L'application sélectionnée est utilisée pour ouvrir ceci et d'autres fichiers de type \"%s\"."
+msgid ""
+"The selected application is used to open this and other files of type \"%s\"."
+msgstr ""
+"L'application sélectionnée est utilisée pour ouvrir ceci et d'autres "
+"fichiers de type \"%s\"."
 
 #. add the "Other Application..." choice
 #: ../thunar/thunar-chooser-button.c:504
 msgid "_Other Application..."
 msgstr "Autre application..."
 
-#: ../thunar/thunar-chooser-dialog.c:220
-#: ../thunar/thunar-launcher.c:140
+#: ../thunar/thunar-chooser-dialog.c:220 ../thunar/thunar-launcher.c:140
 msgid "Open With"
 msgstr "Ouvrir avec"
 
@@ -627,8 +631,12 @@ msgid "Use a _custom command:"
 msgstr "Utiliser une _commande personnalisée :"
 
 #: ../thunar/thunar-chooser-dialog.c:287
-msgid "Use a custom command for an application that is not available from the above application list."
-msgstr "Utiliser une commande personalisée pour une application qui n'est pas disponible depuis la liste d'applications ci-dessus."
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Utiliser une commande personalisée pour une application qui n'est pas "
+"disponible depuis la liste d'applications ci-dessus."
 
 #. create the "Custom command" button
 #: ../thunar/thunar-chooser-dialog.c:306
@@ -665,13 +673,20 @@ msgstr "Ouvrir <i>%s</i> et les autres fichiers de type \"%s\" avec :"
 
 #: ../thunar/thunar-chooser-dialog.c:713
 #, c-format
-msgid "Browse the file system to select an application to open files of type \"%s\"."
-msgstr "Naviguer sur le système de fichier pour choisir une application pour ouvrir les fichiers de type \"%s\"."
+msgid ""
+"Browse the file system to select an application to open files of type \"%s\"."
+msgstr ""
+"Naviguer sur le système de fichier pour choisir une application pour ouvrir "
+"les fichiers de type \"%s\"."
 
 #: ../thunar/thunar-chooser-dialog.c:719
 #, c-format
-msgid "Change the default application for files of type \"%s\" to the selected application."
-msgstr "Utiliser par défaut l'application sélectionnée pour l'ouverture des fichiers de type « %s »."
+msgid ""
+"Change the default application for files of type \"%s\" to the selected "
+"application."
+msgstr ""
+"Utiliser par défaut l'application sélectionnée pour l'ouverture des fichiers "
+"de type « %s »."
 
 #: ../thunar/thunar-chooser-dialog.c:766
 #, c-format
@@ -680,48 +695,52 @@ msgstr "Êtes-vous certain de vouloir supprimer \"%s\"?"
 
 #: ../thunar/thunar-chooser-dialog.c:772
 msgid ""
-"This will remove the application launcher that appears in the file context menu, but will not uninstall the application itself.\n"
+"This will remove the application launcher that appears in the file context "
+"menu, but will not uninstall the application itself.\n"
 "\n"
-"You can only remove application launchers that were created using the custom command box in the \"Open With\" dialog of the file manager."
+"You can only remove application launchers that were created using the custom "
+"command box in the \"Open With\" dialog of the file manager."
 msgstr ""
-"Ceci  supprimera l'application du menu contextuel du fichier mais ne désinstallera pas l'application en elle-même.\n"
+"Ceci  supprimera l'application du menu contextuel du fichier mais ne "
+"désinstallera pas l'application en elle-même.\n"
 "\n"
-"Seule les applications ajoutées via la commande \"utiliser une commande personnalisée\", de la fenêtre \"Ouvrir avec\" du gestionnaire de fichier, peuvent être supprimées. "
+"Seule les applications ajoutées via la commande \"utiliser une commande "
+"personnalisée\", de la fenêtre \"Ouvrir avec\" du gestionnaire de fichier, "
+"peuvent être supprimées. "
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Sélectionner une application"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Fichiers exécutables"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Scripts perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Scripts python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Scripts ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Scripts shell"
 
@@ -811,14 +830,13 @@ msgstr "Redimensionner automatiquement la taille des colonnes"
 #. the file_time is invalid
 #. reset page title
 #. tell the user that we're unable to determine the file info
-#: ../thunar/thunar-column-model.c:890
-#: ../thunar/thunar-list-model.c:727
+#: ../thunar/thunar-column-model.c:890 ../thunar/thunar-list-model.c:727
 #: ../thunar/thunar-list-model.c:756
-#: ../thunar/thunar-permissions-chooser.c:273
-#: ../thunar/thunar-util.c:131
+#: ../thunar/thunar-permissions-chooser.c:273 ../thunar/thunar-util.c:131
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -834,8 +852,7 @@ msgstr "Vue compacte"
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../thunar/thunar-create-dialog.c:181
-#: ../thunar/thunar-standard-view.c:2207
+#: ../thunar/thunar-create-dialog.c:181 ../thunar/thunar-standard-view.c:2207
 msgid "Enter the new name:"
 msgstr "Entrer le nouveau nom :"
 
@@ -867,8 +884,7 @@ msgstr "crédits-traducteur"
 
 #. display an error message to the user
 #. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:229
-#: ../thunar/thunar-renamer-dialog.c:981
+#: ../thunar/thunar-dialogs.c:229 ../thunar/thunar-renamer-dialog.c:981
 msgid "Failed to open the documentation browser"
 msgstr "Échec à l'ouverture du navigateur de la documentation"
 
@@ -906,8 +922,7 @@ msgstr "_Lier ici"
 
 #. display an error to the user
 #. display an error message to the user
-#: ../thunar/thunar-dnd.c:192
-#: ../thunar/thunar-launcher.c:526
+#: ../thunar/thunar-dnd.c:192 ../thunar/thunar-launcher.c:526
 #, c-format
 msgid "Failed to execute file \"%s\""
 msgstr "Échec à l'exécution du fichier \"%s\""
@@ -947,8 +962,7 @@ msgstr "Propriétaire"
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-enum-types.c:96
-#: ../thunar/thunar-properties-dialog.c:491
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:491
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -986,10 +1000,11 @@ msgstr "Suivant"
 msgid "Go to the next visited folder"
 msgstr "Aller vers le répertoire visité suivant"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
-msgstr "Impossible de charger l'icône de « %s » (%s). Véfiriez votre installation !"
+msgstr ""
+"Impossible de charger l'icône de « %s » (%s). Véfiriez votre installation !"
 
 #: ../thunar/thunar-icon-view.c:191
 msgid "Icon based directory listing"
@@ -1000,19 +1015,15 @@ msgid "Icon view"
 msgstr "Vue d'icônes"
 
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:137
-#: ../thunar/thunar-launcher.c:783
+#: ../thunar/thunar-launcher.c:137 ../thunar/thunar-launcher.c:783
 #: ../thunar/thunar-location-buttons.c:1220
-#: ../thunar/thunar-shortcuts-view.c:796
-#: ../thunar/thunar-tree-view.c:1016
+#: ../thunar/thunar-shortcuts-view.c:796 ../thunar/thunar-tree-view.c:1016
 msgid "_Open"
 msgstr "_Ouvrir"
 
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:138
-#: ../thunar/thunar-location-buttons.c:1233
-#: ../thunar/thunar-shortcuts-view.c:807
-#: ../thunar/thunar-tree-view.c:1028
+#: ../thunar/thunar-launcher.c:138 ../thunar/thunar-location-buttons.c:1233
+#: ../thunar/thunar-shortcuts-view.c:807 ../thunar/thunar-tree-view.c:1028
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
@@ -1020,16 +1031,15 @@ msgstr "Ouvrir dans une nouvelle fenêtre"
 msgid "Open the selected directory in a new window"
 msgstr "Ouvrir le répertoire sélectionné dans une nouvelle fenêtre"
 
-#: ../thunar/thunar-launcher.c:139
-#: ../thunar/thunar-launcher.c:141
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
 msgid "Open With Other _Application..."
 msgstr "Ouvrir avec une autre _application..."
 
-#: ../thunar/thunar-launcher.c:139
-#: ../thunar/thunar-launcher.c:141
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
 #: ../thunar/thunar-launcher.c:866
 msgid "Choose another application with which to open the selected file"
-msgstr "Choisissez une autre application avec laquelle ouvrir le fichier sélectionné"
+msgstr ""
+"Choisissez une autre application avec laquelle ouvrir le fichier sélectionné"
 
 #: ../thunar/thunar-launcher.c:621
 #, c-format
@@ -1103,8 +1113,7 @@ msgstr[1] "Exécuter les fichiers sélectionnés"
 msgid "_Open With \"%s\""
 msgstr "_Ouvrir avec \"%s\""
 
-#: ../thunar/thunar-launcher.c:842
-#: ../thunar/thunar-launcher.c:931
+#: ../thunar/thunar-launcher.c:842 ../thunar/thunar-launcher.c:931
 #, c-format
 msgid "Use \"%s\" to open the selected file"
 msgid_plural "Use \"%s\" to open the selected files"
@@ -1140,7 +1149,8 @@ msgstr[1] "Bureau (Créer liens)"
 msgid "Create a link to the selected file on the desktop"
 msgid_plural "Create links to the selected files on the desktop"
 msgstr[0] "Créer un lien symbolique vers le fichier sélectionné sur le bureau"
-msgstr[1] "Créer un lien symbolique vers les fichiers sélectionnés sur le bureau"
+msgstr[1] ""
+"Créer un lien symbolique vers les fichiers sélectionnés sur le bureau"
 
 #: ../thunar/thunar-launcher.c:1248
 #, c-format
@@ -1149,8 +1159,7 @@ msgid_plural "Send the selected files to \"%s\""
 msgstr[0] "Envoyer le fichier sélectionné vers \"%s\""
 msgstr[1] "Envoyer les fichiers sélectionnés vers \"%s\""
 
-#: ../thunar/thunar-list-model.c:775
-#: ../thunar/thunar-properties-dialog.c:760
+#: ../thunar/thunar-list-model.c:775 ../thunar/thunar-properties-dialog.c:760
 msgid "broken link"
 msgstr "lien cassé"
 
@@ -1196,8 +1205,7 @@ msgstr "\"%s\" (%s) %s"
 #. * where the trashed file/folder was located before it was moved to the trash), otherwise the
 #. * properties dialog width will be messed up.
 #.
-#: ../thunar/thunar-list-model.c:2256
-#: ../thunar/thunar-properties-dialog.c:340
+#: ../thunar/thunar-list-model.c:2256 ../thunar/thunar-properties-dialog.c:340
 msgid "Original Path:"
 msgstr "Chemin d'origine :"
 
@@ -1249,8 +1257,7 @@ msgstr "Créer un nouveau dossier dans \"%s\""
 
 #. append the "Create Folder" menu action
 #: ../thunar/thunar-location-buttons.c:1251
-#: ../thunar/thunar-standard-view.c:316
-#: ../thunar/thunar-tree-view.c:1092
+#: ../thunar/thunar-standard-view.c:316 ../thunar/thunar-tree-view.c:1092
 msgid "Create _Folder..."
 msgstr "Création d'un _dossier..."
 
@@ -1261,8 +1268,11 @@ msgstr "Effacer tous les fichiers et dossiers de la corbeille"
 #. add the "Paste Into Folder" action
 #: ../thunar/thunar-location-buttons.c:1280
 #, c-format
-msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
-msgstr "Déplacer ou copier les fichiers précédemment sélectionnés par une commande couper ou copier dans \"%s\""
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgstr ""
+"Déplacer ou copier les fichiers précédemment sélectionnés par une commande "
+"couper ou copier dans \"%s\""
 
 #: ../thunar/thunar-location-buttons.c:1281
 #: ../thunar/thunar-standard-view.c:322
@@ -1281,14 +1291,12 @@ msgstr "_Propriétés"
 
 #. ask the user to enter a name for the new folder
 #: ../thunar/thunar-location-buttons.c:1366
-#: ../thunar/thunar-standard-view.c:1785
-#: ../thunar/thunar-tree-view.c:1448
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
 #: ../thunar/thunar-location-buttons.c:1366
-#: ../thunar/thunar-standard-view.c:1785
-#: ../thunar/thunar-tree-view.c:1448
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "Create New Folder"
 msgstr "Créer un nouveau dossier"
 
@@ -1300,8 +1308,7 @@ msgstr "Aller à..."
 msgid "_Location:"
 msgstr "_Chemin :"
 
-#: ../thunar/thunar-location-entry.c:423
-#: ../thunar/thunar-window.c:1210
+#: ../thunar/thunar-location-entry.c:423 ../thunar/thunar-window.c:1210
 #, c-format
 msgid "Failed to launch \"%s\""
 msgstr "Échec au lancement de \"%s\""
@@ -1414,8 +1421,14 @@ msgid "Do _not ask me again"
 msgstr "_Ne plus me poser cette question"
 
 #: ../thunar/thunar-permissions-chooser.c:626
-msgid "If you select this option your choice will be remembered and you won't be asked again. You can use the preferences dialog to alter your choice afterwards."
-msgstr "Si vous sélectionnez cette option, votre choix sera souvenu et la question ne vous sera plus posée. Vous pouvez utiliser la fenêtre de préférences pour modifier votre choix ultérieurement."
+msgid ""
+"If you select this option your choice will be remembered and you won't be "
+"asked again. You can use the preferences dialog to alter your choice "
+"afterwards."
+msgstr ""
+"Si vous sélectionnez cette option, votre choix sera souvenu et la question "
+"ne vous sera plus posée. Vous pouvez utiliser la fenêtre de préférences pour "
+"modifier votre choix ultérieurement."
 
 #. display an error to the user
 #: ../thunar/thunar-permissions-chooser.c:706
@@ -1441,8 +1454,14 @@ msgid "Correct folder permissions"
 msgstr "Corriger les droits d'un dossier"
 
 #: ../thunar/thunar-permissions-chooser.c:1076
-msgid "The folder permissions will be reset to a consistent state. Only users allowed to read the contents of this folder will be allowed to enter the folder afterwards."
-msgstr "Les droits du dossier seront remise dans un état cohérent. Seuls les utilisateurs autorisés à lire le contenu de ce dossier seront autorisés à entrer dans le dossier."
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+"Les droits du dossier seront remise dans un état cohérent. Seuls les "
+"utilisateurs autorisés à lire le contenu de ce dossier seront autorisés à "
+"entrer dans le dossier."
 
 #: ../thunar/thunar-preferences-dialog.c:222
 msgid "File Manager Preferences"
@@ -1486,23 +1505,33 @@ msgstr "Trier les _dossiers avant les fichiers"
 
 #: ../thunar/thunar-preferences-dialog.c:288
 msgid "Select this option to list folders before files when you sort a folder."
-msgstr "Sélectionner cette option pour lister les dossiers avant les fichiers quand vous trier un dossier."
+msgstr ""
+"Sélectionner cette option pour lister les dossiers avant les fichiers quand "
+"vous trier un dossier."
 
 #: ../thunar/thunar-preferences-dialog.c:292
 msgid "_Show thumbnails"
 msgstr "_Montrer les miniatures"
 
 #: ../thunar/thunar-preferences-dialog.c:294
-msgid "Select this option to display previewable files within a folder as automatically generated thumbnail icons."
-msgstr "Choisir cette option pour afficher les fichiers prévisionnables dans un dossier par des icônes de miniatures générées automatiquement."
+msgid ""
+"Select this option to display previewable files within a folder as "
+"automatically generated thumbnail icons."
+msgstr ""
+"Choisir cette option pour afficher les fichiers prévisionnables dans un "
+"dossier par des icônes de miniatures générées automatiquement."
 
 #: ../thunar/thunar-preferences-dialog.c:315
 msgid "_Text beside icons"
 msgstr "_Texte à côté des icônes"
 
 #: ../thunar/thunar-preferences-dialog.c:317
-msgid "Select this option to place the icon captions for items beside the icon rather than below the icon."
-msgstr "Sélectionner cette option pour placer la légende des éléments à côté de l'icône au lieu d'en dessous."
+msgid ""
+"Select this option to place the icon captions for items beside the icon "
+"rather than below the icon."
+msgstr ""
+"Sélectionner cette option pour placer la légende des éléments à côté de "
+"l'icône au lieu d'en dessous."
 
 #.
 #. Side Pane
@@ -1559,8 +1588,13 @@ msgid "Show Icon _Emblems"
 msgstr "Afficher les _emblèmes"
 
 #: ../thunar/thunar-preferences-dialog.c:378
-msgid "Select this option to display icon emblems in the shortcuts pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Sélectionner cette option pour afficher l'icône de l'emblème dans le panneau des raccourcis pour tous les dossiers pour lesquels des emblèmes ont été définies dans les propriétés de dossiers."
+msgid ""
+"Select this option to display icon emblems in the shortcuts pane for all "
+"folders for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Sélectionner cette option pour afficher l'icône de l'emblème dans le panneau "
+"des raccourcis pour tous les dossiers pour lesquels des emblèmes ont été "
+"définies dans les propriétés de dossiers."
 
 #: ../thunar/thunar-preferences-dialog.c:387
 msgid "Tree Pane"
@@ -1575,8 +1609,13 @@ msgid "Show Icon E_mblems"
 msgstr "Afficher l'icône de l'e_mblème"
 
 #: ../thunar/thunar-preferences-dialog.c:429
-msgid "Select this option to display icon emblems in the tree pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Sélectionnez cette option pour afficher les emblèmes dans l'arborescence pour tous les dossiers pour lesquels des emblèmes ont été définies dans le propriétés des dossiers."
+msgid ""
+"Select this option to display icon emblems in the tree pane for all folders "
+"for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Sélectionnez cette option pour afficher les emblèmes dans l'arborescence "
+"pour tous les dossiers pour lesquels des emblèmes ont été définies dans le "
+"propriétés des dossiers."
 
 #.
 #. Behavior
@@ -1603,8 +1642,19 @@ msgstr ""
 "place dessus :"
 
 #: ../thunar/thunar-preferences-dialog.c:492
-msgid "When single-click activation is enabled, pausing the mouse pointer over an item will automatically select that item after the chosen delay. You can disable this behavior by moving the slider to the left-most position. This behavior may be useful when single clicks activate items, and you want only to select the item without activating it."
-msgstr "Lorsque l'exécution sur simple clique est activée, le fait d'arrêter le pointeur de la souris sur un élément le sélectionnera automatiquement après le délai choisi. Ce comportement peut être désactivé en déplaçant le curseur vers la position gauche absolue. Cela peut être utile lorsqu'un simple clique active les éléments et que vous voulez seulement sélectionner ceux-ci sans les activer."
+msgid ""
+"When single-click activation is enabled, pausing the mouse pointer over an "
+"item will automatically select that item after the chosen delay. You can "
+"disable this behavior by moving the slider to the left-most position. This "
+"behavior may be useful when single clicks activate items, and you want only "
+"to select the item without activating it."
+msgstr ""
+"Lorsque l'exécution sur simple clique est activée, le fait d'arrêter le "
+"pointeur de la souris sur un élément le sélectionnera automatiquement après "
+"le délai choisi. Ce comportement peut être désactivé en déplaçant le curseur "
+"vers la position gauche absolue. Cela peut être utile lorsqu'un simple "
+"clique active les éléments et que vous voulez seulement sélectionner ceux-ci "
+"sans les activer."
 
 #: ../thunar/thunar-preferences-dialog.c:516
 msgid "Disabled"
@@ -1749,18 +1799,15 @@ msgstr "%s - Propriétés"
 msgid "Failed to rename \"%s\""
 msgstr "Échec au changement de nom de \"%s\""
 
-#: ../thunar/thunar-renamer-dialog.c:172
-#: ../thunar/thunar-window.c:253
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:253
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../thunar/thunar-renamer-dialog.c:173
-#: ../thunar/thunar-window.c:255
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:255
 msgid "_Send To"
 msgstr "_Envoyer vers"
 
-#: ../thunar/thunar-renamer-dialog.c:174
-#: ../thunar/thunar-standard-view.c:314
+#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-standard-view.c:314
 msgid "File Context Menu"
 msgstr "Menu contextuel de fichier"
 
@@ -1780,8 +1827,7 @@ msgstr "Vider"
 msgid "Clear the file list below"
 msgstr "Vider la liste ci-dessous"
 
-#: ../thunar/thunar-renamer-dialog.c:178
-#: ../thunar/thunar-window.c:274
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:274
 msgid "_About"
 msgstr "À _propos"
 
@@ -1789,13 +1835,11 @@ msgstr "À _propos"
 msgid "Display information about Thunar Bulk Rename"
 msgstr "Affiche des informations à propos de Thunar Bulk Rename"
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:317
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:317
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "View the properties of the selected file"
 msgstr "Affiche les propriétés du fichier sélectionné"
 
@@ -1811,8 +1855,11 @@ msgid "_Rename Files"
 msgstr "_Renommer des fichiers"
 
 #: ../thunar/thunar-renamer-dialog.c:371
-msgid "Click here to actually rename the files listed above to their new names."
-msgstr "Cliquer ici pour renommer les fichiers listés ci-dessus vers leurs nouveaux noms."
+msgid ""
+"Click here to actually rename the files listed above to their new names."
+msgstr ""
+"Cliquer ici pour renommer les fichiers listés ci-dessus vers leurs nouveaux "
+"noms."
 
 #: ../thunar/thunar-renamer-dialog.c:443
 msgid "New Name"
@@ -1820,7 +1867,9 @@ msgstr "Nouveau nom"
 
 #: ../thunar/thunar-renamer-dialog.c:508
 msgid "Click here to view the documentation for the selected rename operation."
-msgstr "Cliquez ici pour voir la documentation relative à l'opération de renommage sélectionnée."
+msgstr ""
+"Cliquez ici pour voir la documentation relative à l'opération de renommage "
+"sélectionnée."
 
 #. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
 #. *              and opening the multi rename dialog by selecting multiple files and pressing F2.
@@ -1833,7 +1882,8 @@ msgid ""
 msgstr ""
 "Aucun module utile pour renommer n'a été trouvé sur votre système. \n"
 "Vérifiez votre installation ou contactez l'administrateur à ce sujet. Si \n"
-"vous avez installé Thunar à partir des fichiers sources de l'application, soyez \n"
+"vous avez installé Thunar à partir des fichiers sources de l'application, "
+"soyez \n"
 "certain d'avoir activé le greffon « intégré pour renommer simplement »."
 
 #. allocate the file chooser
@@ -1846,7 +1896,6 @@ msgid "Audio Files"
 msgstr "Fichiers audio"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Fichiers image"
 
@@ -1878,8 +1927,10 @@ msgstr[1] "Supprimer les fichiers"
 #: ../thunar/thunar-renamer-dialog.c:1551
 msgid "Remove the selected file from the list of files to be renamed"
 msgid_plural "Remove the selected files from the list of files to be renamed"
-msgstr[0] "Supprimer le fichier sélectionné de la liste des fichiers à renommer"
-msgstr[1] "Supprimer les fichiers sélectionnés de la liste des fichiers à renommer"
+msgstr[0] ""
+"Supprimer le fichier sélectionné de la liste des fichiers à renommer"
+msgstr[1] ""
+"Supprimer les fichiers sélectionnés de la liste des fichiers à renommer"
 
 #. change title to reflect the standalone status
 #: ../thunar/thunar-renamer-dialog.c:1702
@@ -1892,8 +1943,15 @@ msgid "Failed to rename \"%s\" to \"%s\"."
 msgstr "Échec au changement de nom de \"%s\" en \"%s\"."
 
 #: ../thunar/thunar-renamer-progress.c:221
-msgid "You can either choose to skip this file and continue to rename the remaining files, or revert the previously renamed files to their previous names, or cancel the operation without reverting previous changes."
-msgstr "Vous pouvez choisir soit de passer ce fichier et continuer de renommer les autres fichiers, soit d'annuler les changements effectués aux fichiers précédants, soit d'interrompre l'opération sans annuler les modifications apportées."
+msgid ""
+"You can either choose to skip this file and continue to rename the remaining "
+"files, or revert the previously renamed files to their previous names, or "
+"cancel the operation without reverting previous changes."
+msgstr ""
+"Vous pouvez choisir soit de passer ce fichier et continuer de renommer les "
+"autres fichiers, soit d'annuler les changements effectués aux fichiers "
+"précédants, soit d'interrompre l'opération sans annuler les modifications "
+"apportées."
 
 #: ../thunar/thunar-renamer-progress.c:226
 msgid "_Revert Changes"
@@ -1905,8 +1963,10 @@ msgid "_Skip This File"
 msgstr "_Ignorer ce fichier"
 
 #: ../thunar/thunar-renamer-progress.c:233
-msgid "Do you want to skip this file and continue to rename the remaining files?"
-msgstr "Voulez-vous ignorer ce fichier et continuer à renommer les fichiers restant ?"
+msgid ""
+"Do you want to skip this file and continue to rename the remaining files?"
+msgstr ""
+"Voulez-vous ignorer ce fichier et continuer à renommer les fichiers restant ?"
 
 #: ../thunar/thunar-shortcuts-pane.c:413
 msgid "Side Pane (Create Shortcut)"
@@ -1917,24 +1977,23 @@ msgstr[1] "Panneau latéral (Créer raccourcis)"
 #: ../thunar/thunar-shortcuts-pane.c:415
 msgid "Add the selected folder to the shortcuts side pane"
 msgid_plural "Add the selected folders to the shortcuts side pane"
-msgstr[0] "Ajouter le dossier sélectionné au panneau des raccourcis sur le côté"
-msgstr[1] "Ajouter les dossiers sélectionnés au panneau des raccourcis sur le côté"
+msgstr[0] ""
+"Ajouter le dossier sélectionné au panneau des raccourcis sur le côté"
+msgstr[1] ""
+"Ajouter les dossiers sélectionnés au panneau des raccourcis sur le côté"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:821
-#: ../thunar/thunar-tree-view.c:1042
+#: ../thunar/thunar-shortcuts-view.c:821 ../thunar/thunar-tree-view.c:1042
 msgid "_Mount Volume"
 msgstr "_Monter un volume"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:831
-#: ../thunar/thunar-tree-view.c:1052
+#: ../thunar/thunar-shortcuts-view.c:831 ../thunar/thunar-tree-view.c:1052
 msgid "E_ject Volume"
 msgstr "É_jecter un volume"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:840
-#: ../thunar/thunar-tree-view.c:1061
+#: ../thunar/thunar-shortcuts-view.c:840 ../thunar/thunar-tree-view.c:1061
 msgid "_Unmount Volume"
 msgstr "_Démonter un volume"
 
@@ -1959,15 +2018,13 @@ msgid "Failed to add new shortcut"
 msgstr "Échec à l'ajout d'un nouveau raccourci"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1293
-#: ../thunar/thunar-tree-view.c:1556
+#: ../thunar/thunar-shortcuts-view.c:1293 ../thunar/thunar-tree-view.c:1556
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Échec à l'éjection de \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1339
-#: ../thunar/thunar-tree-view.c:950
+#: ../thunar/thunar-shortcuts-view.c:1339 ../thunar/thunar-tree-view.c:950
 #: ../thunar/thunar-tree-view.c:1607
 #, c-format
 msgid "Failed to mount \"%s\""
@@ -1975,8 +2032,7 @@ msgstr "Échec au montage de \"%s\""
 
 #. display an error dialog to inform the user
 #. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1383
-#: ../thunar/thunar-tree-view.c:1747
+#: ../thunar/thunar-shortcuts-view.c:1383 ../thunar/thunar-tree-view.c:1747
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Échec au démontage de nom de \"%s\""
@@ -2016,14 +2072,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Crée un dossier vide dans le dossier courant"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:318
-#: ../thunar/thunar-tree-view.c:1113
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1113
 msgid "Cu_t"
 msgstr "Co_uper"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:319
-#: ../thunar/thunar-tree-view.c:1125
+#: ../thunar/thunar-standard-view.c:319 ../thunar/thunar-tree-view.c:1125
 msgid "_Copy"
 msgstr "_Copier"
 
@@ -2036,14 +2090,17 @@ msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr "Déplacer ou copier les fichiers précédemment coupés ou copiés"
 
 #. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:321
-#: ../thunar/thunar-tree-view.c:1160
+#: ../thunar/thunar-standard-view.c:321 ../thunar/thunar-tree-view.c:1160
 msgid "_Delete"
 msgstr "_Effacer"
 
 #: ../thunar/thunar-standard-view.c:322
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Déplacer ou copier dans le dossier sélectionné les fichiers précédemment coupés ou copiés"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Déplacer ou copier dans le dossier sélectionné les fichiers précédemment "
+"coupés ou copiés"
 
 #: ../thunar/thunar-standard-view.c:323
 msgid "Select _all Files"
@@ -2065,8 +2122,7 @@ msgstr "Sélectionner tous les fichiers qui correspondent à un certain motif"
 msgid "Du_plicate"
 msgstr "Du_pliquer"
 
-#: ../thunar/thunar-standard-view.c:326
-#: ../thunar/thunar-standard-view.c:3371
+#: ../thunar/thunar-standard-view.c:326 ../thunar/thunar-standard-view.c:3371
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "C_réer un lien"
@@ -2145,14 +2201,18 @@ msgstr "Échec à l'ouverture du répertoire \"%s\""
 #: ../thunar/thunar-standard-view.c:3331
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
-msgstr[0] "Prépare le fichier sélectionné à être déplacé par la commande Coller"
-msgstr[1] "Prépare les fichiers sélectionnés à être déplacé par la commande Coller"
+msgstr[0] ""
+"Prépare le fichier sélectionné à être déplacé par la commande Coller"
+msgstr[1] ""
+"Prépare les fichiers sélectionnés à être déplacé par la commande Coller"
 
 #: ../thunar/thunar-standard-view.c:3339
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
-msgstr[0] "Préparer le fichier sélectionné à être copiés par une commande Coller"
-msgstr[1] "Préparer les fichiers sélectionnés à être copiés par une commande Coller"
+msgstr[0] ""
+"Préparer le fichier sélectionné à être copiés par une commande Coller"
+msgstr[1] ""
+"Préparer les fichiers sélectionnés à être copiés par une commande Coller"
 
 #: ../thunar/thunar-standard-view.c:3350
 msgid "Delete the selected file"
@@ -2399,7 +2459,9 @@ msgstr "Style de la barre d'_outils"
 
 #: ../thunar/thunar-window.c:591
 msgid "Traditional approach with location bar and navigation buttons"
-msgstr "Approche traditionnelle avec les la barre de chemin et les boutons de navigation"
+msgstr ""
+"Approche traditionnelle avec les la barre de chemin et les boutons de "
+"navigation"
 
 #: ../thunar/thunar-window.c:597
 msgid "_Hidden"
@@ -2452,17 +2514,26 @@ msgstr "À propos des modèles"
 
 #: ../thunar/thunar-window.c:1749
 msgid "All files in this folder will appear in the \"Create Document\" menu."
-msgstr "Tous les fichiers dans ce dossier apparaîtront dans le menu \"Créer un document\""
+msgstr ""
+"Tous les fichiers dans ce dossier apparaîtront dans le menu \"Créer un "
+"document\""
 
 #: ../thunar/thunar-window.c:1756
 msgid ""
-"If you frequently create certain kinds of documents, make a copy of one and put it in this folder. Thunar will add an entry for this document in the \"Create Document\" menu.\n"
+"If you frequently create certain kinds of documents, make a copy of one and "
+"put it in this folder. Thunar will add an entry for this document in the "
+"\"Create Document\" menu.\n"
 "\n"
-"You can then select the entry from the \"Create Document\" menu and a copy of the document will be created in the directory you are viewing."
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
 msgstr ""
-"Si vous créez fréquemment un certain type de document, faire une copie de l'un d'en eux et placer le dans ce dossier. Thunar ajoutera une entrée pour ce document dans le menu \"Créer un document\".\n"
+"Si vous créez fréquemment un certain type de document, faire une copie de "
+"l'un d'en eux et placer le dans ce dossier. Thunar ajoutera une entrée pour "
+"ce document dans le menu \"Créer un document\".\n"
 "\n"
-"Vous pouvez alors sélectionner cette entrée dans le menu \"Créer un document\" et une copie de ce document sera créée dans le répertoire que vous utiliser."
+"Vous pouvez alors sélectionner cette entrée dans le menu \"Créer un document"
+"\" et une copie de ce document sera créée dans le répertoire que vous "
+"utiliser."
 
 #: ../thunar/thunar-window.c:1768
 msgid "Do _not display this message again"
@@ -2521,8 +2592,12 @@ msgid "Description:"
 msgstr "Description :"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:165
-msgid "The generic name of the entry, for example \"Web Browser\" in case of Firefox."
-msgstr "Le nom générique de l'entrée, par exemple « Navigateur Web » dans le cas de Firefox."
+msgid ""
+"The generic name of the entry, for example \"Web Browser\" in case of "
+"Firefox."
+msgstr ""
+"Le nom générique de l'entrée, par exemple « Navigateur Web » dans le cas de "
+"Firefox."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
 msgid "Command:"
@@ -2545,8 +2620,13 @@ msgid "Comment:"
 msgstr "Commentaire :"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:232
-msgid "Tooltip for the entry, for example \"View sites on the Internet\" in case of Firefox. Should not be redundant with the name or the description."
-msgstr "La bulle d'aide de l'entrée, par exemple \"Visualiser les sites sur Internet\" dans le cas de Firefox. Le texte doit éviter de répéter le nom ou la description."
+msgid ""
+"Tooltip for the entry, for example \"View sites on the Internet\" in case of "
+"Firefox. Should not be redundant with the name or the description."
+msgstr ""
+"La bulle d'aide de l'entrée, par exemple \"Visualiser les sites sur Internet"
+"\" dans le cas de Firefox. Le texte doit éviter de répéter le nom ou la "
+"description."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
 msgid "Options:"
@@ -2557,8 +2637,15 @@ msgid "Use _startup notification"
 msgstr "Activer la _notification de démarrage"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:259
-msgid "Select this option to enable startup notification when the command is run from the file manager or the menu. Not every application supports startup notification."
-msgstr "Sélectionner cette option pour activer la notification de démarrage lorsqu'une commande est exécutée depuis le gestionnaire de fichier ou le menu. À noter que certaines applications ne supportent pas ce type de notification."
+msgid ""
+"Select this option to enable startup notification when the command is run "
+"from the file manager or the menu. Not every application supports startup "
+"notification."
+msgstr ""
+"Sélectionner cette option pour activer la notification de démarrage "
+"lorsqu'une commande est exécutée depuis le gestionnaire de fichier ou le "
+"menu. À noter que certaines applications ne supportent pas ce type de "
+"notification."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
 msgid "Run in _terminal"
@@ -2566,7 +2653,9 @@ msgstr "Exécuter dans un _terminal"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
 msgid "Select this option to run the command in a terminal window."
-msgstr "Sélectionnez cette option pour exécuter la commande dans une fenêtre de terminal."
+msgstr ""
+"Sélectionnez cette option pour exécuter la commande dans une fenêtre de "
+"terminal."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
 msgid "Launcher"
@@ -2773,15 +2862,23 @@ msgid "Regular _Expression"
 msgstr "_Expression régulière"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:231
-msgid "If you enable this option, the pattern will be treated as a regular expression and matched using the Perl-compatible regular expressions (PCRE). Check the documentation for details about the regular expression syntax."
-msgstr "Si vous activez cette option, le format sera traîté comme une expression régulière à l'aide d'un outil compatible avec Perl. Consultez la documentation pour de plus amples informations à propos de la syntaxe à utiliser pour les expressions régulières."
+msgid ""
+"If you enable this option, the pattern will be treated as a regular "
+"expression and matched using the Perl-compatible regular expressions (PCRE). "
+"Check the documentation for details about the regular expression syntax."
+msgstr ""
+"Si vous activez cette option, le format sera traîté comme une expression "
+"régulière à l'aide d'un outil compatible avec Perl. Consultez la "
+"documentation pour de plus amples informations à propos de la syntaxe à "
+"utiliser pour les expressions régulières."
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:238
 msgid "Replace _With:"
 msgstr "Remplacer _par :"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:246
-msgid "Enter the text that should be used as replacement for the pattern above."
+msgid ""
+"Enter the text that should be used as replacement for the pattern above."
 msgstr "Entrer le texte à utiliser pour remplacer le texte ci-dessus."
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:258
@@ -2789,8 +2886,12 @@ msgid "C_ase Sensitive Search"
 msgstr "Recherche sensible à la casse"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:260
-msgid "If you enable this option, the pattern will be searched in a case-sensitive manner. The default is to use a case-insensitive search."
-msgstr "Si vous activez cette option, le motif sera recherché de manière sensible à la casse. Par défaut la recherche est insensible à la casse."
+msgid ""
+"If you enable this option, the pattern will be searched in a case-sensitive "
+"manner. The default is to use a case-insensitive search."
+msgstr ""
+"Si vous activez cette option, le motif sera recherché de manière sensible à "
+"la casse. Par défaut la recherche est insensible à la casse."
 
 #. setup a tooltip with the error message
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:620
@@ -2817,8 +2918,15 @@ msgid "Send com_pressed"
 msgstr "Envoyer com_pressé"
 
 #: ../plugins/thunar-sendto-email/main.c:181
-msgid "When sending a file via email, you can either choose to send the file directly, as is, or compress the file before attaching it to an email. It is highly recommended to compress large files before sending them."
-msgstr "Lors de l'envoi d'un fichier par couriel, vous avez le choix entre l'envoyer directement en l'attachant au couriel ou en le compressant dans une archive et attacher cette dernière au couriel. Il est fortement conseillé de compresser les fichiers d'une certaine taille."
+msgid ""
+"When sending a file via email, you can either choose to send the file "
+"directly, as is, or compress the file before attaching it to an email. It is "
+"highly recommended to compress large files before sending them."
+msgstr ""
+"Lors de l'envoi d'un fichier par couriel, vous avez le choix entre l'envoyer "
+"directement en l'attachant au couriel ou en le compressant dans une archive "
+"et attacher cette dernière au couriel. Il est fortement conseillé de "
+"compresser les fichiers d'une certaine taille."
 
 #: ../plugins/thunar-sendto-email/main.c:192
 #, c-format
@@ -2832,8 +2940,16 @@ msgid "Send as _archive"
 msgstr "Envoyer en tant qu'_archive"
 
 #: ../plugins/thunar-sendto-email/main.c:200
-msgid "When sending multiple files via email, you can either choose to send the files directly, attaching multiple files to an email, or send all files compressed into a single archive file and attach the archive. It is highly recommended to send multiple large files as archive."
-msgstr "Lors d'envois de fichiers par couriel, vous avez le choix entre les envoyer directement en les attachant tous au couriel ou en les compressant tous dans une archive et attacher cette dernière au couriel. Il est fortement conseillé de compresser les fichiers d'une certaine taille."
+msgid ""
+"When sending multiple files via email, you can either choose to send the "
+"files directly, attaching multiple files to an email, or send all files "
+"compressed into a single archive file and attach the archive. It is highly "
+"recommended to send multiple large files as archive."
+msgstr ""
+"Lors d'envois de fichiers par couriel, vous avez le choix entre les envoyer "
+"directement en les attachant tous au couriel ou en les compressant tous dans "
+"une archive et attacher cette dernière au couriel. Il est fortement "
+"conseillé de compresser les fichiers d'une certaine taille."
 
 #. allocate the progress dialog
 #. setup the label
@@ -2948,53 +3064,75 @@ msgstr "Échec à la sauvegarde des actions sur le disque."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Base"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Le nom de l'action qui apparaîtra dans le menu contextuel."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Description :"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
-msgid "The description of the action that will be displayed as tooltip in the statusbar when selecting the item from the context menu."
-msgstr "La description de l'action qui apparaîtra comme astuce dans la barre de statut lorsque l'élément est sélectionné à partir du menu contextuel."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
+msgid ""
+"The description of the action that will be displayed as tooltip in the "
+"statusbar when selecting the item from the context menu."
+msgstr ""
+"La description de l'action qui apparaîtra comme astuce dans la barre de "
+"statut lorsque l'élément est sélectionné à partir du menu contextuel."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Commande :"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
-msgid "The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, %D, %N) are used, the action will be applicable even if more than one item is selected. Else the action will only be applicable if exactly one item is selected."
-msgstr "La commande (incluant les paramètres nécessaires) pour exécuter cette action. Voir la légende des paramètres de commande pour une liste des paramètres variables supportés, qui seront substituées lorsque la commande est lancée. Quand une lettre majuscule (i.e. %F, %D, %N) est utilisée, l'action est applicable même si plus d'un élément est sélectionné. Sinon l'action est uniquement applicable à l'élément sélectionné."
-
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
+msgid ""
+"The command (including the necessary parameters) to perform the action. See "
+"the command parameter legend below for a list of supported parameter "
+"variables, which will be substituted when launching the command. When upper-"
+"case letters (e.g. %F, %D, %N) are used, the action will be applicable even "
+"if more than one item is selected. Else the action will only be applicable "
+"if exactly one item is selected."
+msgstr ""
+"La commande (incluant les paramètres nécessaires) pour exécuter cette "
+"action. Voir la légende des paramètres de commande pour une liste des "
+"paramètres variables supportés, qui seront substituées lorsque la commande "
+"est lancée. Quand une lettre majuscule (i.e. %F, %D, %N) est utilisée, "
+"l'action est applicable même si plus d'un élément est sélectionné. Sinon "
+"l'action est uniquement applicable à l'élément sélectionné."
+
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
-msgstr "Naviguer sur le système de fichier pour choisir une application à utiliser pour cette action."
+msgstr ""
+"Naviguer sur le système de fichier pour choisir une application à utiliser "
+"pour cette action."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Icône :"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Pas d'icône"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
-msgid "Click this button to select an icon file that will be displayed in the context menu in addition to the action name chosen above."
-msgstr "Cliquer sur ce bouton pour sélectionner l'icône qui apparaîtra dans le menu contextuel en plus du nom de l'action choisi au-dessus."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
+msgid ""
+"Click this button to select an icon file that will be displayed in the "
+"context menu in addition to the action name chosen above."
+msgstr ""
+"Cliquer sur ce bouton pour sélectionner l'icône qui apparaîtra dans le menu "
+"contextuel en plus du nom de l'action choisi au-dessus."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3002,73 +3140,81 @@ msgstr ""
 "Les paramètres de commande suivant seront\n"
 "substitués lors du lancement de l'action :"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "le chemin vers le premier fichier sélectionné"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "les chemins vers tous les fichiers sélectionnés"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "répertoire contenant le fichier qui est passé dans %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "répertoires contenant les fichiers qui sont passés dans %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "le premier nom de fichier sélectionné (sans le chemin)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "les noms des fichiers (sans les chemins)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Conditions d'apparition"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "Motif de _fichier :"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
-msgid "Enter a list of patterns that will be used to determine whether this action should be displayed for a selected file. If you specify more than one pattern here, the list items must be separated with semicolons (e.g. *.txt;*.doc)."
-msgstr "Entrer une liste de motifs qui seront utilisés pour déterminer si oui ou non une action peut être effectuée pour le fichier sélectionné. Si vous spécifiez plus d'un motif ici, le caractère utilisé pour séparer les éléments de la liste est le point virgule (i.e. *.txt;*.doc)."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
+msgid ""
+"Enter a list of patterns that will be used to determine whether this action "
+"should be displayed for a selected file. If you specify more than one "
+"pattern here, the list items must be separated with semicolons (e.g. *.txt;*."
+"doc)."
+msgstr ""
+"Entrer une liste de motifs qui seront utilisés pour déterminer si oui ou non "
+"une action peut être effectuée pour le fichier sélectionné. Si vous "
+"spécifiez plus d'un motif ici, le caractère utilisé pour séparer les "
+"éléments de la liste est le point virgule (i.e. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Apparaît si la sélection contient :"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Répertoires"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "Fichiers _audio"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Fichiers _image"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Fichiers _texte"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Fichiers _video"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "Autres _fichiers"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3092,8 +3238,10 @@ msgstr ""
 "plus, vous pouvez spécifier que cette action puisse\n"
 "seulement apparaître pour certains types de fichiers."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Sélectionner une icône"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
@@ -3123,8 +3271,11 @@ msgid "Configure c_ustom actions..."
 msgstr "Configurer les actions pers_onnalisée..."
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:189
-msgid "Setup custom actions that will appear in the file managers context menus"
-msgstr "Configurer les actions personnalisées qui apparaîtront dans les menus contextuels du gestionnaire de fichiers"
+msgid ""
+"Setup custom actions that will appear in the file managers context menus"
+msgstr ""
+"Configurer les actions personnalisées qui apparaîtront dans les menus "
+"contextuels du gestionnaire de fichiers"
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:406
 #, c-format
@@ -3167,6 +3318,7 @@ msgstr "Ouvrir les dossiers spécifiés dans Thunar"
 #~ msgstr ""
 #~ "Des liens de ou vers des ressources dans la corbeille ne sont pas "
 #~ "supportés"
+
 #~ msgid "Delete the selected file permanently"
 #~ msgid_plural "Delete the selected files permanently"
 #~ msgstr[0] "Supprime définitivement le fichier sélectionné"
@@ -3175,14 +3327,17 @@ msgstr "Ouvrir les dossiers spécifiés dans Thunar"
 #, fuzzy
 #~ msgid "Failed to change permisions of \"%s\""
 #~ msgstr "Échec au changement des droits de \"%s\" : %s"
+
 #~ msgid "Failed to determine file info of \"%s\": %s"
 #~ msgstr "Échec pour déterminer des informations sur le fichier \"%s\" : %s"
+
 #~ msgid ""
 #~ "The file \"%s\" already exists. Do you want to replace it with an empty "
 #~ "file?"
 #~ msgstr ""
 #~ "Le fichier \"%s\" existe déjà. Voulez-vous le remplacer par un fichier "
 #~ "vide ?"
+
 #~ msgid ""
 #~ "Failed to remove \"%s\".\n"
 #~ "\n"
@@ -3191,6 +3346,7 @@ msgstr "Ouvrir les dossiers spécifiés dans Thunar"
 #~ "Impossible de supprimer %s.\n"
 #~ "\n"
 #~ "Voulez-vous l'ignorer ?"
+
 #~ msgid ""
 #~ "Failed to create empty file \"%s\".\n"
 #~ "\n"
@@ -3199,22 +3355,30 @@ msgstr "Ouvrir les dossiers spécifiés dans Thunar"
 #~ "Échec à la création du fichier vide \"%s\".\n"
 #~ "\n"
 #~ "Voulez-vous l'ignorer ?"
+
 #~ msgid "Failed to stat file \"%s\": %s"
 #~ msgstr "Échec pour récupérer le statut du fichier \"%s\" : %s"
+
 #~ msgid "Failed to create directory \"%s\": %s"
 #~ msgstr "Échec à la création du répertoire \"%s\" : %s"
+
 #~ msgid "Deleting directories..."
 #~ msgstr "Suppression des répertoires..."
+
 #~ msgid "Failed to remove directory \"%s\": %s"
 #~ msgstr "Échec à la suppression du répertoire \"%s\" : %s"
+
 #~ msgid "Cannot transfer the root directory"
 #~ msgstr "Ne peut pas transférer le répertoire racine"
+
 #~ msgid "Operation canceled"
 #~ msgstr "Opération annulée"
+
 #~ msgid "Failed to read link target from \"%s\""
 #~ msgstr "Échec à la lecture de la cible du lien de \"%s\""
+
 #~ msgid "Failed to change mode of \"%s\""
 #~ msgstr "Échec au changement de mode de \"%s\""
+
 #~ msgid "Failed to copy special file \"%s\""
 #~ msgstr "Échec à la copie du fichier spécial \"%s\""
-
diff --git a/po/gl.po b/po/gl.po
index 5b928561b9ee66be6a3fcd7f24f57f14f3904fb8..3153629fc449cfe0d11f13480ca13db7abc86809 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: thunar\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2006-05-29 13:01+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-07-05 14:54+0000\n"
 "Last-Translator: Iván_one2 <talivan.ivan@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -16,355 +16,347 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:168
-#: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:271
-msgid "Collecting files..."
-msgstr "Reunindo ficheiros..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:189
-#: ../thunar-vfs/thunar-vfs-chown-job.c:187
-#: ../thunar-vfs/thunar-vfs-link-job.c:213
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:785
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"¿Desexa omitir este paso?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
-#: ../thunar-vfs/thunar-vfs-chown-job.c:251
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Non se puido determina-la información do ficheiro «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Non se puideron muda-los permisos de «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:267
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Non se puido muda-lo dono de «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:269
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Non se puido muda-lo grupo de «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-creat-job.c:188
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-"O ficheiro «%s» xa existe. ¿Desexa substituílo por un ficheiro baleiro?"
-
-#: ../thunar-vfs/thunar-vfs-creat-job.c:199
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:236
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Non se puido eliminar «%s».\n"
-"\n"
-"¿Desexa omitir este paso?"
-
-#: ../thunar-vfs/thunar-vfs-creat-job.c:216
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Non se puido crea-lo ficheiro baleiro «%s».\n"
-"\n"
-"¿Desexa omitir este paso?"
-
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:220
+#. base directory not readable
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:233
 msgid "Failed to read folder contents"
 msgstr "Non se puido le-lo contido do cartafol"
 
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:338
 msgid "No Exec field specified"
 msgstr "Campo Exec non especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:357
 msgid "No URL field specified"
 msgstr "Campo URL non especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:870
 msgid "Invalid desktop file"
 msgstr "O ficheiro de escritorio non é válido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
 msgid "Failed to parse file"
 msgstr "Non se puido analisa-lo ficheiro"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
 msgid "Invalid file name"
 msgstr "O nome do ficheiro non é válido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Non se puido executar 'stat' sobre o ficheiro «%s»: %s"
-
-#. ask the user whether we should remove the target first
-#: ../thunar-vfs/thunar-vfs-link-job.c:177
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:765
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"¿Desexa sobrescribilo?"
-
-#: ../thunar-vfs/thunar-vfs-link-job.c:201
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1778
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:665
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:718
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Non se puido eliminar «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1712
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Non se puido carga-la aplicación dende o ficheiro «%s»"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
-msgid "Command"
-msgstr "Instrución"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
-msgid "The command to run the mime handler"
-msgstr "A instrución para executa-lo manexador mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
-msgid "Flags"
-msgstr "Indicadores"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
-msgid "The flags for the mime handler"
-msgstr "Os indicadores para o manexador mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
-msgid "Icon"
-msgstr "Icona"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Seleccione os ficheiros a renomear"
 
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
-msgid "The icon of the mime handler"
-msgstr "A icona do manexador mime"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Preparando..."
 
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:431
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nome"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:520
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Non se puideron muda-los permisos de «%s»: %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
-msgid "The name of the mime handler"
-msgstr "O nome do manexador mime"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owner of \"%s\""
+msgstr "Non se puido muda-lo dono de «%s»: %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "documento %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Non se puido muda-lo grupo de «%s»: %s"
 
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:165
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:185
 #, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Non se puido crea-lo directorio «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Rota demasiado grande para o almacenador intermedio"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI demasiado grande para o almacenador intermedio"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:179 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Tamaño"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:180
-msgid "The desired thumbnail size"
-msgstr "O tamaño desexado para a miniatura"
+msgid "The file \"%s\" already exists"
+msgstr "O ficheiro «%s» xa existe"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:367
-msgid "Deleting directories..."
-msgstr "Eliminando directorios..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Non se puido crea-lo tubo chamado «%s»"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:387
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:160
 #, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Non se puido elimina-lo directorio «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:911
-msgid "Cannot transfer the root directory"
-msgstr "Non se pode transferi-lo directorio raíz"
-
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:163
-msgid "Preparing..."
-msgstr "Preparando..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Non se puido abrir «%s» para lectura"
 
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Rota non válida"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:191
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Non se puido abrir «%s» para escritura"
 
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:218
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:281
 #, c-format
-msgid "Unknown user \"%s\""
-msgstr "Usuario «%s» descoñecido"
+msgid "Failed to write data to \"%s\""
+msgstr "Non se puideron escribi-los datos en «%s»"
 
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:234
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:297
+#: ../thunar-vfs/thunar-vfs-io-ops.c:496 ../thunar/thunar-chooser-dialog.c:787
 #, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Non se puido determina-lo punto de montaxe para %s"
+msgid "Failed to remove \"%s\""
+msgstr "Non se puido eliminar «%s»"
 
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:812
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:264
 #, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Non se puido conectar co daemon HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Non se puideron le-los datos de «%s»"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:346
 #, c-format
 msgid "copy of %s"
 msgstr "copia de %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
+#: ../thunar/thunar-list-model.c:777 ../thunar/thunar-properties-dialog.c:762
 #, c-format
 msgid "link to %s"
 msgstr "ligazón a %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:350
 #, c-format
 msgid "another copy of %s"
 msgstr "outra copia de %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
 #, c-format
 msgid "another link to %s"
 msgstr "outra ligazón a %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:354
 #, c-format
 msgid "third copy of %s"
 msgstr "terceira copia de %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:355
 #, c-format
 msgid "third link to %s"
 msgstr "terceira ligazón a %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:394
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:410
 #, c-format
 msgid "%uth copy of %s"
 msgid_plural "%uth copy of %s"
 msgstr[0] "%uª copia de %s"
 msgstr[1] "%uª copias de %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:412
 #, c-format
 msgid "%uth link to %s"
 msgid_plural "%uth link to %s"
 msgstr[0] "ligazón %uª a %s"
 msgstr[1] "ligazón %uª a %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:472
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:589
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Non se puido determina-la información do ficheiro para «%s»"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:488
+#: ../thunar-vfs/thunar-vfs-io-ops.c:416
 #, c-format
 msgid "Failed to create directory \"%s\""
 msgstr "Non se puido crea-lo directorio «%s»"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:497
 #, c-format
 msgid "Failed to create named fifo \"%s\""
 msgstr "Non se puido crea-lo tubo chamado «%s»"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Non se admiten os tubos con nome"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:515
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:595
 #, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Non se puido abrir «%s» para lectura"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Non se puido crea-la ligazón simbólica «%s»"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "O ficheiro «%s» xa existe"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:528
+msgid "Special files cannot be copied"
+msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Non se puido abrir «%s» para escritura"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:608
+msgid "Symbolic links are not supported"
+msgstr "Non se admiten as ligazóns simbólicas"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Non se puideron le-los datos de «%s»"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:306
+msgid "File System"
+msgstr "Sistema de ficheiros"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Non se puido renomear «%s» a «%s»."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:290
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Non se puido renomear «%s» a «%s»."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:367
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Non se puido renomear «%s» a «%s»."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "A rota «%s» non apunta a ningún directorio"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-job.c:831
+#, fuzzy
+msgid "Do you want to overwrite it?"
+msgstr ""
+"%s.\n"
+"\n"
+"¿Desexa sobrescribilo?"
+
+#: ../thunar-vfs/thunar-vfs-job.c:896
+#, fuzzy
+msgid "Do you want to skip it?"
+msgstr ""
+"%s.\n"
+"\n"
+"¿Desexa omitir este paso?"
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1675
 #, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Non se puideron escribi-los datos en «%s»"
+msgid "Failed to load application from file %s"
+msgstr "Non se puido carga-la aplicación dende o ficheiro «%s»"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1741
 #, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Non se puido eliminar «%s»"
+msgid "Failed to remove \"%s\": %s"
+msgstr "Non se puido eliminar «%s»: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operación cancelada"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Instrución"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Non se puido le-lo destino da ligazón dende «%s»"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "A instrución para executa-lo manexador mime"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Indicadores"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Os indicadores para o manexador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Icona"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "A icona do manexador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:427
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nome"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "O nome do manexador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
 #, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Non se puido crea-la ligazón simbólica «%s»"
+msgid "%s document"
+msgstr "documento %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
 #, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Non se puido muda-lo modo de «%s»"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Non se admiten as ligazóns simbólicas"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Rota demasiado grande para o almacenador intermedio"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI demasiado grande para o almacenador intermedio"
+
+#: ../thunar-vfs/thunar-vfs-private.c:225
+#, fuzzy
+msgid "Operation not supported"
+msgstr "Non se admiten os tubos con nome"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:327
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:222 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Tamaño"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:223
+msgid "The desired thumbnail size"
+msgstr "O tamaño desexado para a miniatura"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Reunindo ficheiros..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Rota non válida"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-util.c:287
 #, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Non se puido determina-la información do ficheiro para «%s»"
+msgid "Unknown user \"%s\""
+msgstr "Usuario «%s» descoñecido"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
 #, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Non se puido copia-lo ficheiro especial «%s»"
+msgid "Failed to determine the mount point for %s"
+msgstr "Non se puido determina-lo punto de montaxe para %s"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Non se puido conectar co daemon HAL: %s"
 
 #: ../thunar/main.c:54
 msgid "Open the bulk rename dialog"
@@ -390,10 +382,12 @@ msgstr "Saír dunha instancia do Thunar en execución (non admitido)"
 msgid "Print version information and exit"
 msgstr "Imprimir información sobre a versión e saír"
 
+#. setup application name
 #: ../thunar/main.c:88
 msgid "Thunar"
 msgstr "Thunar"
 
+#. initialize Gtk+
 #: ../thunar/main.c:98
 msgid "[FILES...]"
 msgstr "[FICHEIROS...]"
@@ -403,6 +397,7 @@ msgstr "[FICHEIROS...]"
 msgid "Thunar: Failed to open display: %s\n"
 msgstr "Thunar: Non se puido abri-la pantalla: %s\n"
 
+#. yep, there's an error, so print it
 #: ../thunar/main.c:110
 #, c-format
 msgid "Thunar: %s\n"
@@ -425,107 +420,201 @@ msgstr "Escrito por Benedikt Meurer <benny@xfce.org>."
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, informe de erros a <%s>."
 
-#: ../thunar/thunar-abstract-icon-view.c:116
+#: ../thunar/thunar-abstract-icon-view.c:117
 msgid "Arran_ge Items"
 msgstr "Or_ganizar elementos"
 
-#: ../thunar/thunar-abstract-icon-view.c:121
+#: ../thunar/thunar-abstract-icon-view.c:122
 msgid "Sort By _Name"
 msgstr "Ordenar por _nome"
 
-#: ../thunar/thunar-abstract-icon-view.c:121
+#: ../thunar/thunar-abstract-icon-view.c:122
 msgid "Keep items sorted by their name"
 msgstr "Mante-los elementos ordenados polo nome"
 
-#: ../thunar/thunar-abstract-icon-view.c:122
+#: ../thunar/thunar-abstract-icon-view.c:123
 msgid "Sort By _Size"
 msgstr "Ordenar por _tamaño"
 
-#: ../thunar/thunar-abstract-icon-view.c:122
+#: ../thunar/thunar-abstract-icon-view.c:123
 msgid "Keep items sorted by their size"
 msgstr "Mante-los elementos ordenados polo tamaño"
 
-#: ../thunar/thunar-abstract-icon-view.c:123
+#: ../thunar/thunar-abstract-icon-view.c:124
 msgid "Sort By _Type"
 msgstr "Ordenar por t_ipo"
 
-#: ../thunar/thunar-abstract-icon-view.c:123
+#: ../thunar/thunar-abstract-icon-view.c:124
 msgid "Keep items sorted by their type"
 msgstr "Mante-los elementos ordenados polo tipo"
 
-#: ../thunar/thunar-abstract-icon-view.c:124
+#: ../thunar/thunar-abstract-icon-view.c:125
 msgid "Sort By Modification _Date"
 msgstr "Ordenar por _data de modificación"
 
-#: ../thunar/thunar-abstract-icon-view.c:124
+#: ../thunar/thunar-abstract-icon-view.c:125
 msgid "Keep items sorted by their modification date"
 msgstr "Mante-los elementos ordenados pola data de modificación"
 
-#: ../thunar/thunar-abstract-icon-view.c:129
+#: ../thunar/thunar-abstract-icon-view.c:130
 msgid "_Ascending"
 msgstr "_Ascendente"
 
-#: ../thunar/thunar-abstract-icon-view.c:129
+#: ../thunar/thunar-abstract-icon-view.c:130
 msgid "Sort items in ascending order"
 msgstr "Ordenar elementos por orde ascendente"
 
-#: ../thunar/thunar-abstract-icon-view.c:130
+#: ../thunar/thunar-abstract-icon-view.c:131
 msgid "_Descending"
 msgstr "_Descendente"
 
-#: ../thunar/thunar-abstract-icon-view.c:130
+#: ../thunar/thunar-abstract-icon-view.c:131
 msgid "Sort items in descending order"
 msgstr "Ordenar elementos por orde descendente"
 
-#: ../thunar/thunar-application.c:335
+#. display an error message to the user
+#: ../thunar/thunar-application.c:361 ../thunar/thunar-application.c:405
 msgid "Failed to launch operation"
 msgstr "Non se puido executa-la operación"
 
-#: ../thunar/thunar-application.c:787
+#. tell the user that we were unable to launch the file specified on the cmdline
+#: ../thunar/thunar-application.c:858
 #, c-format
 msgid "Failed to open \"%s\""
 msgstr "Non se puido abrir «%s»"
 
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:870
 #, c-format
 msgid "Failed to open \"%s\": %s"
 msgstr "Non se puido abrir «%s»: %s"
 
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:907 ../thunar/thunar-application.c:940
 msgid "Copying files..."
 msgstr "Copiando ficheiros..."
 
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:974
 msgid "Creating symbolic links..."
 msgstr "Creando ligazóns simbólicas..."
 
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:1014
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Movendo ficheiros..."
+
+#: ../thunar/thunar-application.c:1019
 msgid "Moving files..."
 msgstr "Movendo ficheiros..."
 
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1099
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"¿Tén a certeza de querer eliminar\n"
+"permanentemente «%s»?"
+
+#: ../thunar/thunar-application.c:1104
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"¿Tén a certeza de querer eliminar permanentemente\n"
+"o ficheiro seleccionado?"
+msgstr[1] ""
+"¿Tén a certeza de querer eliminar permanentemente\n"
+"os %u ficheiros seleccionados?"
+
+#: ../thunar/thunar-application.c:1124
+msgid "If you delete a file, it is permanently lost."
+msgstr "Se elimina un ficheiro, será de forma permanente."
+
+#: ../thunar/thunar-application.c:1134
 msgid "Deleting files..."
 msgstr "Eliminando ficheiros..."
 
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1186
 msgid "Creating files..."
 msgstr "Creando ficheiros..."
 
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1226
 msgid "Creating directories..."
 msgstr "Creando directorios..."
 
+#: ../thunar/thunar-application.c:1264
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1269
+#: ../thunar/thunar-location-buttons.c:1265
+#: ../thunar/thunar-shortcuts-view.c:855 ../thunar/thunar-tree-view.c:1076
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Ficheiro _baleiro"
+
+#: ../thunar/thunar-application.c:1273
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1290
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1344
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Non se puido determina-lo punto de montaxe para %s"
+
+#: ../thunar/thunar-application.c:1372
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Crear un novo cartafol en «%s»"
+
+#: ../thunar/thunar-application.c:1376
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Crear carta_fol..."
+
+#: ../thunar/thunar-application.c:1382
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1419
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Non se puido eliminar «%s»"
+
+#: ../thunar/thunar-application.c:1426
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Eliminando ficheiros..."
+
 #. tell the user that it didn't work
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#. display an error to the user
+#: ../thunar/thunar-chooser-button.c:275 ../thunar/thunar-chooser-dialog.c:506
 #, c-format
 msgid "Failed to set default application for \"%s\""
 msgstr "Non se puido estabelece-la aplicación predeterminada para «%s»"
 
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:360
 msgid "No application selected"
 msgstr "Non se seleccionou ningunha aplicación"
 
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:366
 #, c-format
 msgid ""
 "The selected application is used to open this and other files of type \"%s\"."
@@ -533,19 +622,21 @@ msgstr ""
 "A aplicación seleccionada úsase para abrir este tipo de ficheiros e outros "
 "do tipo «%s»."
 
-#: ../thunar/thunar-chooser-button.c:514
+#. add the "Other Application..." choice
+#: ../thunar/thunar-chooser-button.c:504
 msgid "_Other Application..."
 msgstr "_Outra aplicación..."
 
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-chooser-dialog.c:220 ../thunar/thunar-launcher.c:140
 msgid "Open With"
 msgstr "Abrir con"
 
-#: ../thunar/thunar-chooser-dialog.c:291
+#. create the "Custom command" expand
+#: ../thunar/thunar-chooser-dialog.c:286
 msgid "Use a _custom command:"
 msgstr "Usar unha instrución _personalizada:"
 
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:287
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
@@ -553,34 +644,40 @@ msgstr ""
 "Usar unha instrucción personalizada para unha aplicación que non estea "
 "dispoñíbel dentro da seguinte listaxe."
 
-#: ../thunar/thunar-chooser-dialog.c:311
+#. create the "Custom command" button
+#: ../thunar/thunar-chooser-dialog.c:306
 msgid "_Browse..."
 msgstr "_Procurar..."
 
-#: ../thunar/thunar-chooser-dialog.c:317
+#. create the "Use as default for this kind of file" button
+#: ../thunar/thunar-chooser-dialog.c:312
 msgid "Use as _default for this kind of file"
 msgstr "Usar de xeito predeterminado para este tipo de ficheiro"
 
-#: ../thunar/thunar-chooser-dialog.c:499
+#. display an error to the user
+#: ../thunar/thunar-chooser-dialog.c:481
 #, c-format
 msgid "Failed to add new application \"%s\""
 msgstr "Non se puido engadi-la nova aplicación «%s»"
 
-#: ../thunar/thunar-chooser-dialog.c:544
+#. display an error to the user
+#: ../thunar/thunar-chooser-dialog.c:526
 #, c-format
 msgid "Failed to execute \"%s\""
 msgstr "Non se puido executar «%s»"
 
-#: ../thunar/thunar-chooser-dialog.c:622
+#. append the "Remove Launcher" item
+#: ../thunar/thunar-chooser-dialog.c:604
 msgid "_Remove Launcher"
 msgstr "_Eliminar marcador"
 
-#: ../thunar/thunar-chooser-dialog.c:723
+#. update the header label
+#: ../thunar/thunar-chooser-dialog.c:705
 #, c-format
 msgid "Open <i>%s</i> and other files of type \"%s\" with:"
 msgstr "Abrir <i>%s</i> e outros ficheiros do tipo «%s» con:"
 
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:713
 #, c-format
 msgid ""
 "Browse the file system to select an application to open files of type \"%s\"."
@@ -588,7 +685,7 @@ msgstr ""
 "Explora-lo sistema de ficheiros para seleccionar unha aplicación que abra "
 "ficheiros do tipo «%s»."
 
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:719
 #, c-format
 msgid ""
 "Change the default application for files of type \"%s\" to the selected "
@@ -597,12 +694,12 @@ msgstr ""
 "Muda-la aplicación predeterminada para ficheiros do tipo «%s» á aplicación "
 "escollida."
 
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:766
 #, c-format
 msgid "Are you sure that you want to remove \"%s\"?"
 msgstr "¿Tén a certeza de querer eliminar «%s»?"
 
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:772
 msgid ""
 "This will remove the application launcher that appears in the file context "
 "menu, but will not uninstall the application itself.\n"
@@ -617,68 +714,71 @@ msgstr ""
 "caixa de instrucións personalizada no diálogo «Abrir con» do xestor de "
 "ficheiros."
 
-#: ../thunar/thunar-chooser-dialog.c:831
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../thunar/thunar-chooser-dialog.c:813
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Seleccionar unha aplicación"
 
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1102
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../thunar/thunar-chooser-dialog.c:823
+#: ../thunar/thunar-renamer-dialog.c:1095
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Tódolos ficheiros"
 
-#: ../thunar/thunar-chooser-dialog.c:846
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../thunar/thunar-chooser-dialog.c:828
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Ficheiros executábeles"
 
-#: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../thunar/thunar-chooser-dialog.c:843
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Scripts en Perl"
 
-#: ../thunar/thunar-chooser-dialog.c:867
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../thunar/thunar-chooser-dialog.c:849
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Scripts en Python"
 
-#: ../thunar/thunar-chooser-dialog.c:873
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../thunar/thunar-chooser-dialog.c:855
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Scripts en Ruby"
 
-#: ../thunar/thunar-chooser-dialog.c:879
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../thunar/thunar-chooser-dialog.c:861
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Scripts de shell"
 
-#: ../thunar/thunar-chooser-model.c:339
+#: ../thunar/thunar-chooser-model.c:340
 msgid "None available"
 msgstr "Ningún dispoñíbel"
 
-#: ../thunar/thunar-chooser-model.c:383
+#. append the "Recommended Applications:" category
+#: ../thunar/thunar-chooser-model.c:384
 msgid "Recommended Applications"
 msgstr "Aplicacións recomendadas"
 
-#: ../thunar/thunar-chooser-model.c:386
+#. append the "Other Applications:" category
+#: ../thunar/thunar-chooser-model.c:387
 msgid "Other Applications"
 msgstr "Outras aplicacións"
 
-#: ../thunar/thunar-clipboard-manager.c:361
+#. tell the user that we cannot paste
+#: ../thunar/thunar-clipboard-manager.c:362
 msgid "There is nothing on the clipboard to paste"
 msgstr "Non hai nada no portapapeis que se poida pegar"
 
-#: ../thunar/thunar-column-editor.c:153
+#: ../thunar/thunar-column-editor.c:154
 msgid "Configure Columns in the Detailed List View"
 msgstr "Configura-las columnas no modo de vista detallado"
 
-#: ../thunar/thunar-column-editor.c:164
+#: ../thunar/thunar-column-editor.c:165
 msgid "Visible Columns"
 msgstr "Columnas visíbeles"
 
-#: ../thunar/thunar-column-editor.c:177
+#. create the top label for the column editor dialog
+#: ../thunar/thunar-column-editor.c:178
 msgid ""
 "Choose the order of information to appear in the\n"
 "detailed list view."
@@ -686,31 +786,37 @@ msgstr ""
 "Escolla a orde na que debe aparece-la información\n"
 "no modo de vista detallada."
 
-#: ../thunar/thunar-column-editor.c:218
+#. create the "Move Up" button
+#: ../thunar/thunar-column-editor.c:219
 msgid "Move _Up"
 msgstr "S_ubir"
 
-#: ../thunar/thunar-column-editor.c:228
+#. create the "Move Down" button
+#: ../thunar/thunar-column-editor.c:229
 msgid "Move Dow_n"
 msgstr "_Baixar"
 
-#: ../thunar/thunar-column-editor.c:238
+#. create the "Show" button
+#: ../thunar/thunar-column-editor.c:239
 msgid "_Show"
 msgstr "Amo_sar"
 
-#: ../thunar/thunar-column-editor.c:244
+#. create the "Hide" button
+#: ../thunar/thunar-column-editor.c:245
 msgid "Hi_de"
 msgstr "A_gochar"
 
-#: ../thunar/thunar-column-editor.c:255
+#. create the "Use Default" button
+#: ../thunar/thunar-column-editor.c:256
 msgid "Use De_fault"
 msgstr "Usar _predeterminado"
 
-#: ../thunar/thunar-column-editor.c:264
+#: ../thunar/thunar-column-editor.c:265
 msgid "Column Sizing"
 msgstr "Tamaño de columna"
 
-#: ../thunar/thunar-column-editor.c:277
+#. create the label that explains the column sizing option
+#: ../thunar/thunar-column-editor.c:278
 msgid ""
 "By default columns will be automatically expanded if\n"
 "needed to ensure the text is fully visible. If you dis-\n"
@@ -722,17 +828,21 @@ msgstr ""
 "inhabilita embaixo este comportamento, o xestor de\n"
 "ficheiros usará sempre a largura de columna definida polo usuario."
 
-#: ../thunar/thunar-column-editor.c:286
+#. create the "Automatically expand columns as needed" button
+#: ../thunar/thunar-column-editor.c:287
 msgid "Automatically _expand columns as needed"
 msgstr "_Expandir automaticamente as columnas cando se requira"
 
+#. the file_time is invalid
 #. reset page title
-#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
-#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#. tell the user that we're unable to determine the file info
+#: ../thunar/thunar-column-model.c:890 ../thunar/thunar-list-model.c:727
+#: ../thunar/thunar-list-model.c:756
+#: ../thunar/thunar-permissions-chooser.c:273 ../thunar/thunar-util.c:131
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -744,54 +854,83 @@ msgstr "Listaxe de directorios compacta"
 msgid "Compact view"
 msgstr "Vista compacta"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:166
+#, fuzzy
+msgid "C_reate"
+msgstr "Crear"
+
+#: ../thunar/thunar-create-dialog.c:181 ../thunar/thunar-standard-view.c:2207
 msgid "Enter the new name:"
 msgstr "Introduza o novo nome:"
 
-#: ../thunar/thunar-create-dialog.c:528
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:529
 #, c-format
 msgid "Cannot convert filename \"%s\" to the local encoding"
 msgstr "Non se pode converte-lo nome de ficheiro «%s» á codificación local"
 
-#: ../thunar/thunar-details-view.c:130
+#: ../thunar/thunar-details-view.c:131
 msgid "Configure _Columns..."
 msgstr "Configurar _columnas..."
 
-#: ../thunar/thunar-details-view.c:130
+#: ../thunar/thunar-details-view.c:131
 msgid "Configure the columns in the detailed list view"
 msgstr "Configura-las columnas no modo de vista detallado"
 
-#: ../thunar/thunar-details-view.c:414
+#: ../thunar/thunar-details-view.c:420
 msgid "Detailed directory listing"
 msgstr "Listaxe de directorios detallada"
 
-#: ../thunar/thunar-details-view.c:415
+#: ../thunar/thunar-details-view.c:421
 msgid "Details view"
 msgstr "Vista de detalles"
 
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:102
 msgid "translator-credits"
 msgstr "Iván Seoane <ovellanegra@gmail.com>"
 
-#. display an error message to the user
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:988
-msgid "Failed to open the documentation browser"
-msgstr "Non se puido abri-lo visor de documentación"
+#. display an error message to the user
+#. tell the user that we failed
+#: ../thunar/thunar-dialogs.c:229 ../thunar/thunar-renamer-dialog.c:981
+msgid "Failed to open the documentation browser"
+msgstr "Non se puido abri-lo visor de documentación"
+
+#: ../thunar/thunar-dialogs.c:326
+msgid "_Yes"
+msgstr "_Si"
+
+#: ../thunar/thunar-dialogs.c:330
+msgid "Yes to _all"
+msgstr "Si _a todo"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_No"
+msgstr "_Non"
+
+#: ../thunar/thunar-dialogs.c:338
+#, fuzzy
+msgid "N_o to all"
+msgstr "Si _a todo"
+
+#: ../thunar/thunar-dialogs.c:343
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../thunar/thunar-dnd.c:62
+#: ../thunar/thunar-dnd.c:63
 msgid "_Copy here"
 msgstr "_Copiar aquí"
 
-#: ../thunar/thunar-dnd.c:62
+#: ../thunar/thunar-dnd.c:63
 msgid "_Move here"
 msgstr "_Mover aquí"
 
-#: ../thunar/thunar-dnd.c:62
+#: ../thunar/thunar-dnd.c:63
 msgid "_Link here"
 msgstr "_Ligar aquí"
 
 #. display an error to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:497
+#. display an error message to the user
+#: ../thunar/thunar-dnd.c:192 ../thunar/thunar-launcher.c:526
 #, c-format
 msgid "Failed to execute file \"%s\""
 msgstr "Non se puido executa-lo ficheiro «%s»"
@@ -828,8 +967,10 @@ msgstr "Tipo MIME"
 msgid "Owner"
 msgstr "Dono"
 
-#. 
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#.
+#. Permissions chooser
+#.
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:491
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -845,37 +986,34 @@ msgstr "Ficheiro"
 msgid "File Name"
 msgstr "Nome do ficheiro"
 
-#: ../thunar/thunar-file.c:786
+#: ../thunar/thunar-file.c:796
 msgid "The root folder has no parent"
 msgstr "O cartafol raíz non tén precedentes"
 
-#: ../thunar/thunar-file.c:1125
-msgid "File System"
-msgstr "Sistema de ficheiros"
-
-#: ../thunar/thunar-history.c:179
+#. create the "back" action
+#: ../thunar/thunar-history.c:193
 msgid "Back"
 msgstr "Recuar"
 
-#: ../thunar/thunar-history.c:179
+#: ../thunar/thunar-history.c:193
 msgid "Go to the previous visited folder"
 msgstr "Ir ó anterior cartafol visitado"
 
-#: ../thunar/thunar-history.c:184
+#. create the "forward" action
+#: ../thunar/thunar-history.c:199
 msgid "Forward"
 msgstr "Avanzar"
 
-#: ../thunar/thunar-history.c:184
+#: ../thunar/thunar-history.c:199
 msgid "Go to the next visited folder"
 msgstr "Ir ó seguinte cartafol visitado"
 
 #: ../thunar/thunar-icon-factory.c:675
 #, c-format
-msgid ""
-"Failed to load fallback icon from \"%s\" (%s). Check your installation!"
+msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
-"Non se puido carga-la icona de «fallback» (caer cara a atrás) dende «%s» "
-"(%s). ¡Comprobe a súa instalación!"
+"Non se puido carga-la icona de «fallback» (caer cara a atrás) dende «%s» (%"
+"s). ¡Comprobe a súa instalación!"
 
 #: ../thunar/thunar-icon-view.c:191
 msgid "Icon based directory listing"
@@ -885,216 +1023,259 @@ msgstr "Listaxe de directorios baseada en iconas"
 msgid "Icon view"
 msgstr "Vista de iconas"
 
-#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
-#: ../thunar/thunar-location-buttons.c:1273
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#. append the "Open" menu action
+#: ../thunar/thunar-launcher.c:137 ../thunar/thunar-launcher.c:783
+#: ../thunar/thunar-location-buttons.c:1220
+#: ../thunar/thunar-shortcuts-view.c:796 ../thunar/thunar-tree-view.c:1016
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../thunar/thunar-launcher.c:120
-msgid "Open the selected files"
-msgstr "Abri-los ficheiros seleccionados"
-
-#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1286
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:138 ../thunar/thunar-location-buttons.c:1233
+#: ../thunar/thunar-shortcuts-view.c:807 ../thunar/thunar-tree-view.c:1028
 msgid "Open in New Window"
 msgstr "Abrir nunha nova xanela"
 
-#: ../thunar/thunar-launcher.c:121
-msgid "Open the selected directories in new Thunar windows"
-msgstr "Abre os directorios seleccionados nunha nova xanela do Thunar"
+#: ../thunar/thunar-launcher.c:138
+#, fuzzy
+msgid "Open the selected directory in a new window"
+msgstr "Abri-lo directorio seleccionado en %d nova xanela"
 
-#: ../thunar/thunar-launcher.c:122 ../thunar/thunar-launcher.c:124
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
 msgid "Open With Other _Application..."
 msgstr "Abrir con outra _aplicación..."
 
-#: ../thunar/thunar-launcher.c:122 ../thunar/thunar-launcher.c:124
-#: ../thunar/thunar-launcher.c:839
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
+#: ../thunar/thunar-launcher.c:866
 msgid "Choose another application with which to open the selected file"
 msgstr "Escoller outra aplicación para abri-lo ficheiro seleccionado"
 
-#: ../thunar/thunar-launcher.c:123
-msgid "Choose a program with which to open the selected file"
-msgstr "Escolla un programa para abri-lo ficheiro seleccionado"
-
-#: ../thunar/thunar-launcher.c:592
+#: ../thunar/thunar-launcher.c:621
 #, c-format
 msgid "Failed to open file \"%s\""
 msgstr "Non se puido abri-lo ficheiro «%s»"
 
-#: ../thunar/thunar-launcher.c:598
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:627
 #, c-format
 msgid "Failed to open %d file"
 msgid_plural "Failed to open %d files"
 msgstr[0] "Non se puido abrir %d ficheiro"
 msgstr[1] "Non se puideron abrir %d ficheiros"
 
-#: ../thunar/thunar-launcher.c:634
+#: ../thunar/thunar-launcher.c:663
 msgid "Are you sure you want to open all folders?"
 msgstr "¿Tén a certeza de querer abrir tódolos cartafoles?"
 
-#: ../thunar/thunar-launcher.c:636
+#: ../thunar/thunar-launcher.c:665
 #, c-format
 msgid "This will open %d separate file manager window."
 msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Isto abrirá %d xanela separada do xestor de ficheiros."
 msgstr[1] "Isto abrirá %d xanelas separadas do xestor de ficheiros."
 
-#: ../thunar/thunar-launcher.c:640
+#: ../thunar/thunar-launcher.c:669
 #, c-format
 msgid "Open %d New Window"
 msgid_plural "Open %d New Windows"
 msgstr[0] "Abrir %d nova xanela"
 msgstr[1] "Abrir %d novas xanelas"
 
-#: ../thunar/thunar-launcher.c:734
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:761
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Abrir en %d nova xanela"
 msgstr[1] "Abrir en %d novas xanelas"
 
-#: ../thunar/thunar-launcher.c:735
+#: ../thunar/thunar-launcher.c:762
 #, c-format
 msgid "Open the selected directory in %d new window"
 msgid_plural "Open the selected directories in %d new windows"
 msgstr[0] "Abri-lo directorio seleccionado en %d nova xanela"
 msgstr[1] "Abri-los directorios seleccionados en %d novas xanelas"
 
-#: ../thunar/thunar-launcher.c:755
+#: ../thunar/thunar-launcher.c:782
 msgid "_Open in New Window"
 msgstr "_Abrir nunha nova xanela"
 
-#: ../thunar/thunar-launcher.c:758
+#: ../thunar/thunar-launcher.c:785
 msgid "Open the selected file"
 msgid_plural "Open the selected files"
 msgstr[0] "Abri-lo ficheiro seleccionado"
 msgstr[1] "Abri-los ficheiros seleccionados"
 
-#: ../thunar/thunar-launcher.c:807
+#: ../thunar/thunar-launcher.c:834
 msgid "_Execute"
 msgstr "_Executar"
 
-#: ../thunar/thunar-launcher.c:808
+#: ../thunar/thunar-launcher.c:835
 msgid "Execute the selected file"
 msgid_plural "Execute the selected files"
 msgstr[0] "Executa-lo ficheiro seleccionado"
 msgstr[1] "Executa-los ficheiros seleccionados"
 
-#: ../thunar/thunar-launcher.c:814
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:841
 #, c-format
 msgid "_Open With \"%s\""
 msgstr "_Abrir con «%s»"
 
-#: ../thunar/thunar-launcher.c:815 ../thunar/thunar-launcher.c:902
+#: ../thunar/thunar-launcher.c:842 ../thunar/thunar-launcher.c:931
 #, c-format
 msgid "Use \"%s\" to open the selected file"
 msgid_plural "Use \"%s\" to open the selected files"
 msgstr[0] "Usar «%s» para abri-lo ficheiro seleccionado"
 msgstr[1] "Usar «%s» para abri-los ficheiros seleccionados"
 
-#: ../thunar/thunar-launcher.c:838
+#: ../thunar/thunar-launcher.c:865
 msgid "_Open With Other Application..."
 msgstr "_Abrir con outra aplicación..."
 
-#: ../thunar/thunar-launcher.c:847
+#: ../thunar/thunar-launcher.c:874
 msgid "_Open With Default Applications"
 msgstr "_Abrir con aplicacións predeterminadas"
 
-#: ../thunar/thunar-launcher.c:848
+#: ../thunar/thunar-launcher.c:875
 msgid "Open the selected file with the default application"
 msgid_plural "Open the selected files with the default applications"
 msgstr[0] "Abri-lo ficheiro seleccionado coa aplicación predeterminada"
 msgstr[1] "Abri-los ficheiros seleccionados coas aplicacións predeterminadas"
 
-#: ../thunar/thunar-launcher.c:901
+#: ../thunar/thunar-launcher.c:930
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Abrir con «%s»"
 
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-launcher.c:1214
+msgid "Desktop (Create Link)"
+msgid_plural "Desktop (Create Links)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:1215
+#, fuzzy
+msgid "Create a link to the selected file on the desktop"
+msgid_plural "Create links to the selected files on the desktop"
+msgstr[0] "Crear unha ligazón simbólico para o ficheiro seleccionado"
+msgstr[1] "Crear unha ligazón simbólica para cada ficheiro seleccionado"
+
+#: ../thunar/thunar-launcher.c:1248
+#, fuzzy, c-format
+msgid "Send the selected file to \"%s\""
+msgid_plural "Send the selected files to \"%s\""
+msgstr[0] "Abri-los ficheiros seleccionados"
+msgstr[1] "Abri-los ficheiros seleccionados"
+
+#: ../thunar/thunar-list-model.c:775 ../thunar/thunar-properties-dialog.c:760
 msgid "broken link"
 msgstr "ligazón crebada"
 
-#: ../thunar/thunar-list-model.c:2197
+#. generate a text which includes the size of all items in the folder
+#: ../thunar/thunar-list-model.c:2203
 #, c-format
 msgid "%d item (%s), Free space: %s"
 msgid_plural "%d items (%s), Free space: %s"
 msgstr[0] "%d elemento (%s), espazo libre: %s"
 msgstr[1] "%d elementos (%s), espazo libre: %s"
 
-#: ../thunar/thunar-list-model.c:2206
+#. just the standard text
+#: ../thunar/thunar-list-model.c:2212
 #, c-format
 msgid "%d item, Free space: %s"
 msgid_plural "%d items, Free space: %s"
 msgstr[0] "%d elemento, espazo libre: %s"
 msgstr[1] "%d elementos, espazo libre: %s"
 
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2220
 #, c-format
 msgid "%d item"
 msgid_plural "%d items"
 msgstr[0] "%d elemento"
 msgstr[1] "%d elementos"
 
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2236
 #, c-format
 msgid "\"%s\" broken link"
 msgstr "«%s» ligazón crebada"
 
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2240
 #, c-format
 msgid "\"%s\" (%s) link to %s"
 msgstr "«%s» (%s) ligazón para %s"
 
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2245
 #, c-format
 msgid "\"%s\" (%s) %s"
 msgstr "«%s» (%s) %s"
 
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2256 ../thunar/thunar-properties-dialog.c:340
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2268
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Tamaño da imaxe:"
+
+#: ../thunar/thunar-list-model.c:2287
 #, c-format
 msgid "%d item selected (%s)"
 msgid_plural "%d items selected (%s)"
 msgstr[0] "%d elemento seleccionado (%s)"
 msgstr[1] "%d elementos seleccionados (%s)"
 
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2292
 #, c-format
 msgid "%d item selected"
 msgid_plural "%d items selected"
 msgstr[0] "%d elemento seleccionado"
 msgstr[1] "%d elementos seleccionados"
 
-#: ../thunar/thunar-location-buttons.c:265
+#: ../thunar/thunar-location-buttons.c:262
 msgid "Spacing"
 msgstr "Espazamento"
 
-#: ../thunar/thunar-location-buttons.c:266
+#: ../thunar/thunar-location-buttons.c:263
 msgid "The amount of space between the path buttons"
 msgstr "Espazo entre os botóns de dirección"
 
-#: ../thunar/thunar-location-buttons.c:1272
+#. add the "Open" action
+#: ../thunar/thunar-location-buttons.c:1219
 #, c-format
 msgid "Open \"%s\" in this window"
 msgstr "Abrir «%s» nesta xanela"
 
-#: ../thunar/thunar-location-buttons.c:1285
+#. add the "Open in New Window" action
+#: ../thunar/thunar-location-buttons.c:1232
 #, c-format
 msgid "Open \"%s\" in a new window"
 msgstr "Abrir «%s» nunha nova xanela"
 
-#: ../thunar/thunar-location-buttons.c:1300
+#. add the "Create Folder" action
+#: ../thunar/thunar-location-buttons.c:1250
 #, c-format
 msgid "Create a new folder in \"%s\""
 msgstr "Crear un novo cartafol en «%s»"
 
-#: ../thunar/thunar-location-buttons.c:1301
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#. append the "Create Folder" menu action
+#: ../thunar/thunar-location-buttons.c:1251
+#: ../thunar/thunar-standard-view.c:316 ../thunar/thunar-tree-view.c:1092
 msgid "Create _Folder..."
 msgstr "Crear carta_fol..."
 
-#: ../thunar/thunar-location-buttons.c:1316
+#: ../thunar/thunar-location-buttons.c:1265
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
+#. add the "Paste Into Folder" action
+#: ../thunar/thunar-location-buttons.c:1280
 #, c-format
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1102,93 +1283,99 @@ msgstr ""
 "Move ou copia ficheiros (seleccionados previamente mediante a instrución "
 "Copiar ou Cortar) a «%s»"
 
-#: ../thunar/thunar-location-buttons.c:1317
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1281
+#: ../thunar/thunar-standard-view.c:322
 msgid "Paste Into Folder"
 msgstr "Pegar dentro do cartafol"
 
-#: ../thunar/thunar-location-buttons.c:1332
+#. add the "Properties" action
+#: ../thunar/thunar-location-buttons.c:1296
 #, c-format
 msgid "View the properties of the folder \"%s\""
 msgstr "Ve-las propiedades do cartafol «%s»"
 
-#: ../thunar/thunar-location-buttons.c:1333
+#: ../thunar/thunar-location-buttons.c:1297
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-location-buttons.c:1402
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-location-buttons.c:1366
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "New Folder"
 msgstr "Novo cartafol"
 
-#: ../thunar/thunar-location-buttons.c:1402
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1366
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "Create New Folder"
 msgstr "Crear novo cartafol"
 
-#: ../thunar/thunar-location-dialog.c:88
+#: ../thunar/thunar-location-dialog.c:89
 msgid "Open Location"
 msgstr "Abrir localización"
 
-#: ../thunar/thunar-location-dialog.c:102
+#: ../thunar/thunar-location-dialog.c:103
 msgid "_Location:"
 msgstr "_Localización:"
 
-#: ../thunar/thunar-location-entry.c:423 ../thunar/thunar-window.c:1208
+#: ../thunar/thunar-location-entry.c:423 ../thunar/thunar-window.c:1210
 #, c-format
 msgid "Failed to launch \"%s\""
 msgstr "Non se puido executar «%s»"
 
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:259
 msgid "Icon size"
 msgstr "Tamaño da icona"
 
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:260
 msgid "The icon size for the path entry"
 msgstr "O tamaño de icona da entrada de dirección"
 
-#: ../thunar/thunar-permissions-chooser.c:243
+#. 0000
+#: ../thunar/thunar-permissions-chooser.c:246
 msgid "None"
 msgstr "Ningún"
 
-#: ../thunar/thunar-permissions-chooser.c:245
+#. 0002
+#: ../thunar/thunar-permissions-chooser.c:248
 msgid "Write only"
 msgstr "Só para escritura"
 
-#: ../thunar/thunar-permissions-chooser.c:247
+#. 0004
+#: ../thunar/thunar-permissions-chooser.c:250
 msgid "Read only"
 msgstr "Só para lectura"
 
-#: ../thunar/thunar-permissions-chooser.c:249
+#. 0006
+#: ../thunar/thunar-permissions-chooser.c:252
 msgid "Read & Write"
 msgstr "Lectura e escritura"
 
-#: ../thunar/thunar-permissions-chooser.c:260
+#: ../thunar/thunar-permissions-chooser.c:263
 msgid "Owner:"
 msgstr "Dono:"
 
-#: ../thunar/thunar-permissions-chooser.c:284
-#: ../thunar/thunar-permissions-chooser.c:337
+#: ../thunar/thunar-permissions-chooser.c:287
+#: ../thunar/thunar-permissions-chooser.c:340
 msgid "Access:"
 msgstr "Acceso:"
 
-#: ../thunar/thunar-permissions-chooser.c:313
+#: ../thunar/thunar-permissions-chooser.c:316
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../thunar/thunar-permissions-chooser.c:366
+#: ../thunar/thunar-permissions-chooser.c:369
 msgid "Others:"
 msgstr "Outros:"
 
-#: ../thunar/thunar-permissions-chooser.c:395
+#: ../thunar/thunar-permissions-chooser.c:398
 msgid "Program:"
 msgstr "Programa:"
 
-#: ../thunar/thunar-permissions-chooser.c:401
+#: ../thunar/thunar-permissions-chooser.c:404
 msgid "Allow this file to _run as a program"
 msgstr "Permitir a este ficheiro executa_rse coma programa"
 
-#: ../thunar/thunar-permissions-chooser.c:427
+#: ../thunar/thunar-permissions-chooser.c:430
 msgid ""
 "Allowing untrusted programs to run\n"
 "presents a security risk to your system."
@@ -1196,7 +1383,7 @@ msgstr ""
 "Permiti-la execución de programas non-confiábeles\n"
 "é un risco para a seguranza do seu sistema."
 
-#: ../thunar/thunar-permissions-chooser.c:442
+#: ../thunar/thunar-permissions-chooser.c:445
 msgid ""
 "The folder permissions are inconsistent, you\n"
 "may not be able to work with files in this folder."
@@ -1204,25 +1391,24 @@ msgstr ""
 "Os permisos do cartafol están inconsistentes, polo que\n"
 "é posíbel que non poidas traballar cos ficheiros neste cartafol."
 
-#: ../thunar/thunar-permissions-chooser.c:455
+#: ../thunar/thunar-permissions-chooser.c:458
 msgid "Correct folder permissions..."
 msgstr "Corrixi-los permisos do cartafol..."
 
-#: ../thunar/thunar-permissions-chooser.c:456
+#: ../thunar/thunar-permissions-chooser.c:459
 msgid "Click here to automatically fix the folder permissions."
 msgstr "Prema aquí para corrixi-los permisos do cartafol automaticamente."
 
-#: ../thunar/thunar-permissions-chooser.c:467
+#: ../thunar/thunar-permissions-chooser.c:470
 msgid "Please wait..."
 msgstr "Por favor, agarde..."
 
-#: ../thunar/thunar-permissions-chooser.c:472
+#: ../thunar/thunar-permissions-chooser.c:475
 msgid "Stop applying permissions recursively."
 msgstr "Deixar de aplica-los permisos recursivamente."
 
+#. allocate the question dialog
 #: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
 msgid "Question"
 msgstr "Pregunta"
 
@@ -1231,9 +1417,10 @@ msgid "Apply recursively?"
 msgstr "¿Aplicar recursivamente?"
 
 #: ../thunar/thunar-permissions-chooser.c:620
+#, fuzzy
 msgid ""
 "Do you want to apply your changes recursively to\n"
-"all files and subfolder below the selected folder?"
+"all files and subfolders below the selected folder?"
 msgstr ""
 "¿Quere aplica-las mudanzas recursivamente a tódolos\n"
 "ficheiros e subcartafoles contidos no cartafol seleccionado?"
@@ -1252,28 +1439,30 @@ msgstr ""
 "novo. Se máis tarde quere altera-la súa decisión pode usa-lo diálogo de "
 "preferencias."
 
+#. display an error to the user
 #: ../thunar/thunar-permissions-chooser.c:706
 msgid "Failed to change group"
 msgstr "Non se puido modifica-lo grupo"
 
+#. display an error to the user
 #: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:1098
 msgid "Failed to apply new permissions"
 msgstr "Non se puideron aplica-los novos permisos"
 
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:941
 msgid "Unknown file owner"
 msgstr "Dono do ficheiro descoñecido"
 
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1072
 msgid "Correct folder permissions automatically?"
 msgstr "¿Corrixi-los permisos do cartafol automaticamente?"
 
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1074
 msgid "Correct folder permissions"
 msgstr "Corrixi-los permisos do cartafol"
 
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1076
 msgid ""
 "The folder permissions will be reset to a consistent state. Only users "
 "allowed to read the contents of this folder will be allowed to enter the "
@@ -1282,76 +1471,57 @@ msgstr ""
 "Os permisos do cartafol reaxustaranse a un estado consistente. Logo só os "
 "usuarios con permisos para le-lo contido do cartafol poderán entrar nel."
 
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Si"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Si _a todo"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Non"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
 msgid "File Manager Preferences"
 msgstr "Preferencias do xestor de ficheiros"
 
-#. 
-#: ../thunar/thunar-preferences-dialog.c:246
+#.
+#. Views
+#.
+#: ../thunar/thunar-preferences-dialog.c:239
 msgid "Views"
 msgstr "_Vistas"
 
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
 msgid "Default View"
 msgstr "Vista predeterminada"
 
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
 msgid "View _new folders using:"
 msgstr "Ve-los _novos caratafoles usando:"
 
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
 msgid "Icon View"
 msgstr "Vista de iconas"
 
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
 msgid "Detailed List View"
 msgstr "Visualización de listaxe detallada"
 
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
 msgid "Compact List View"
 msgstr "Visualización de listaxe compacta"
 
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
 msgid "Last Active View"
 msgstr "Última visualización activa"
 
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
 msgid "Sort _folders before files"
 msgstr "Ordena-los cartafoles antes dos _ficheiros"
 
-#: ../thunar/thunar-preferences-dialog.c:295
-msgid ""
-"Select this option to list folders before files when you sort a folder."
+#: ../thunar/thunar-preferences-dialog.c:288
+msgid "Select this option to list folders before files when you sort a folder."
 msgstr ""
 "Seleccione esta opción para lista-los cartafoles antes dos ficheiros, ó "
 "ordenar un cartafol."
 
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
 msgid "_Show thumbnails"
 msgstr "Amo_sar miniaturas"
 
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
 msgid ""
 "Select this option to display previewable files within a folder as "
 "automatically generated thumbnail icons."
@@ -1359,11 +1529,11 @@ msgstr ""
 "Seleccione esta opción para amosar unha previsualización en miniatura dos "
 "ficheiros dentro do cartafol."
 
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
 msgid "_Text beside icons"
 msgstr "_Texto ó carón das iconas"
 
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
 msgid ""
 "Select this option to place the icon captions for items beside the icon "
 "rather than below the icon."
@@ -1371,59 +1541,61 @@ msgstr ""
 "Seleccione esta opción para situa-lo texto das iconas ó seu carón no canto "
 "de pólas embaixo delas."
 
-#. 
-#: ../thunar/thunar-preferences-dialog.c:333
+#.
+#. Side Pane
+#.
+#: ../thunar/thunar-preferences-dialog.c:326
 msgid "Side Pane"
 msgstr "Panel lateral"
 
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
 msgid "Shortcuts Pane"
 msgstr "Panel de atallos"
 
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
 msgid "_Icon Size:"
 msgstr "Tamaño das _iconas"
 
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
 msgid "Very Small"
 msgstr "Moi pequeno"
 
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
 msgid "Smaller"
 msgstr "O máis pequeno"
 
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
 msgid "Small"
 msgstr "Pequeno"
 
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
 msgid "Normal"
 msgstr "Normal"
 
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
 msgid "Large"
 msgstr "Grande"
 
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
 msgid "Larger"
 msgstr "O máis grande"
 
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
 msgid "Very Large"
 msgstr "Moi grande"
 
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
 msgid "Show Icon _Emblems"
 msgstr "Amosa-los _emblemas das iconas"
 
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
 msgid ""
 "Select this option to display icon emblems in the shortcuts pane for all "
 "folders for which emblems have been defined in the folders properties dialog."
@@ -1432,19 +1604,19 @@ msgstr ""
 "atallos para tódolos cartafoles para os que se definiron emblemas no diálogo "
 "de propiedades do cartafol."
 
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
 msgid "Tree Pane"
 msgstr "Panel arborescente"
 
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
 msgid "Icon _Size:"
 msgstr "Tamaño das _iconas"
 
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
 msgid "Show Icon E_mblems"
 msgstr "A_mosar emblemas das iconas"
 
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
 msgid ""
 "Select this option to display icon emblems in the tree pane for all folders "
 "for which emblems have been defined in the folders properties dialog."
@@ -1453,17 +1625,22 @@ msgstr ""
 "arborescente para tódolos cartafoles para os que se definiron emblemas no "
 "diálogo de propiedades do cartafol."
 
-#. 
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#.
+#. Behavior
+#.
+#: ../thunar/thunar-preferences-dialog.c:438
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
 msgid "_Single click to activate items"
 msgstr "Unha _soa pulsación para activa-los elementos"
 
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
 msgid ""
 "Specify the d_elay before an item gets selected\n"
 "when the mouse pointer is paused over it:"
@@ -1471,7 +1648,7 @@ msgstr ""
 "_Especifique o atraso antes de que un elemento sexa seleccionado\n"
 "cando o punteiro do rato se deteña sobre el:"
 
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
 msgid ""
 "When single-click activation is enabled, pausing the mouse pointer over an "
 "item will automatically select that item after the chosen delay. You can "
@@ -1486,32 +1663,34 @@ msgstr ""
 "cando unha soa pulsación activa os elementos e só desexa selecciona-lo "
 "elemento sen activalo."
 
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
 msgid "Disabled"
 msgstr "Inhabilitado"
 
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
 msgid "Medium"
 msgstr "Medio"
 
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
 msgid "Long"
 msgstr "Longo"
 
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
 msgid "_Double click to activate items"
 msgstr "_Dobre pulsación para activa-los elementos"
 
-#. 
-#: ../thunar/thunar-preferences-dialog.c:551
+#.
+#. Advanced
+#.
+#: ../thunar/thunar-preferences-dialog.c:544
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
 msgid "Folder Permissions"
 msgstr "Permisos do cartafol"
 
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
 msgid ""
 "When changing the permissions of a folder, you\n"
 "can also apply the changes to the contents of the\n"
@@ -1521,103 +1700,122 @@ msgstr ""
 "aplica-las modificacións ó que haxa dentro. Seleccione\n"
 "embaixo o comportamento predeterminado:"
 
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
 msgid "Ask everytime"
 msgstr "Preguntar sempre"
 
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
 msgid "Apply to Folder Only"
 msgstr "Aplicar só ó cartafol"
 
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
 msgid "Apply to Folder and Contents"
 msgstr "Aplicar ó cartafol e ó seu contido"
 
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:375
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
 msgstr[0] "(resta %lu hora)"
 msgstr[1] "(restan %lu horas)"
 
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:380
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
 msgstr[0] "(resta %lu minuto)"
 msgstr[1] "(restan %lu minutos)"
 
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:385
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
 msgstr[0] "(resta %lu segundo)"
 msgstr[1] "(restan %lu segundos)"
 
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:249
 msgid "General"
 msgstr "Xeral"
 
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:268
 msgid "Name:"
 msgstr "Nome:"
 
-#. 
-#: ../thunar/thunar-properties-dialog.c:289
+#.
+#. Second box (kind, open with, link target)
+#.
+#: ../thunar/thunar-properties-dialog.c:293
 msgid "Kind:"
 msgstr "Tipo:"
 
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:308
 msgid "Open With:"
 msgstr "Abrir con:"
 
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:322
 msgid "Link Target:"
 msgstr "Destino da ligazón:"
 
-#. 
-#: ../thunar/thunar-properties-dialog.c:343
+#.
+#. Third box (deleted, modified, accessed)
+#.
+#: ../thunar/thunar-properties-dialog.c:365
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Eliminar"
+
+#: ../thunar/thunar-properties-dialog.c:379
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:393
 msgid "Accessed:"
 msgstr "Accedido:"
 
-#. 
-#: ../thunar/thunar-properties-dialog.c:382
+#.
+#. Fourth box (size, volume, free space)
+#.
+#: ../thunar/thunar-properties-dialog.c:418
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:431
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:455
 msgid "Free Space:"
 msgstr "Espazo libre:"
 
-#. 
-#: ../thunar/thunar-properties-dialog.c:444
+#.
+#. Emblem chooser
+#.
+#: ../thunar/thunar-properties-dialog.c:480
 msgid "Emblems"
 msgstr "Emblemas"
 
-#: ../thunar/thunar-properties-dialog.c:687
+#. update the properties dialog title
+#: ../thunar/thunar-properties-dialog.c:723
 #, c-format
 msgid "%s - Properties"
 msgstr "%s - Propiedades"
 
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#. display an error message
+#: ../thunar/thunar-properties-dialog.c:906
+#: ../thunar/thunar-standard-view.c:2249
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Non se puido renomear «%s»"
 
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:253
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:255
+msgid "_Send To"
+msgstr ""
+
+#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-standard-view.c:314
 msgid "File Context Menu"
 msgstr "Menú contextual do ficheiro"
 
@@ -1637,7 +1835,7 @@ msgstr "Limpar"
 msgid "Clear the file list below"
 msgstr "Limpa-la listaxe inferior"
 
-#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:272
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:274
 msgid "_About"
 msgstr "_Sobre"
 
@@ -1645,44 +1843,46 @@ msgstr "_Sobre"
 msgid "Display information about Thunar Bulk Rename"
 msgstr "Amosa información sobre o renomeador masivo do Thunar"
 
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "View the properties of the selected file"
 msgstr "Ve-las propiedades do ficheiro seleccionado"
 
-#: ../thunar/thunar-renamer-dialog.c:364
-#: ../thunar/thunar-renamer-dialog.c:1709
+#: ../thunar/thunar-renamer-dialog.c:360
+#: ../thunar/thunar-renamer-dialog.c:1702
 #: ../Thunar-bulk-rename.desktop.in.in.h:2
 msgid "Rename Multiple Files"
 msgstr "Renomear múltiplos ficheiros"
 
-#: ../thunar/thunar-renamer-dialog.c:372
+#. add the "Rename Files" button
+#: ../thunar/thunar-renamer-dialog.c:368
 msgid "_Rename Files"
 msgstr "_Renomear ficheiros"
 
-#: ../thunar/thunar-renamer-dialog.c:375
+#: ../thunar/thunar-renamer-dialog.c:371
 msgid ""
 "Click here to actually rename the files listed above to their new names."
 msgstr ""
 "Prema aquí para renomear realmente os ficheiros listados enriba ós seus "
 "novos nomes."
 
-#: ../thunar/thunar-renamer-dialog.c:447
+#: ../thunar/thunar-renamer-dialog.c:443
 msgid "New Name"
 msgstr "Novo nome"
 
-#: ../thunar/thunar-renamer-dialog.c:512
-msgid ""
-"Click here to view the documentation for the selected rename operation."
+#: ../thunar/thunar-renamer-dialog.c:508
+msgid "Click here to view the documentation for the selected rename operation."
 msgstr ""
 "Prema aquí para ve-la documentación para a operación de renomeamento "
 "seleccionada."
 
 #. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
-#: ../thunar/thunar-renamer-dialog.c:620
+#. *              and opening the multi rename dialog by selecting multiple files and pressing F2.
+#.
+#: ../thunar/thunar-renamer-dialog.c:616
 msgid ""
 "No renamer modules were found on your system. Please check your\n"
 "installation or contact your system administrator. If you install Thunar\n"
@@ -1693,29 +1893,30 @@ msgstr ""
 "dende as fontes, asegúrese de habilita-la extensión «Simple Builtin "
 "Renamers»."
 
-#: ../thunar/thunar-renamer-dialog.c:1091
+#. allocate the file chooser
+#: ../thunar/thunar-renamer-dialog.c:1084
 msgid "Select files to rename"
 msgstr "Seleccione os ficheiros a renomear"
 
-#: ../thunar/thunar-renamer-dialog.c:1107
+#: ../thunar/thunar-renamer-dialog.c:1100
 msgid "Audio Files"
 msgstr "Ficheiros de audio"
 
-#: ../thunar/thunar-renamer-dialog.c:1112
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
+#: ../thunar/thunar-renamer-dialog.c:1105
 msgid "Image Files"
 msgstr "Ficheiros de imaxe"
 
-#: ../thunar/thunar-renamer-dialog.c:1117
+#: ../thunar/thunar-renamer-dialog.c:1110
 msgid "Video Files"
 msgstr "Ficheiros de vídeo"
 
-#: ../thunar/thunar-renamer-dialog.c:1247
+#. just popup the about dialog
+#: ../thunar/thunar-renamer-dialog.c:1240
 #: ../Thunar-bulk-rename.desktop.in.in.h:1
 msgid "Bulk Rename"
 msgstr "Renomeador masivo"
 
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1241
 msgid ""
 "Thunar Bulk Rename is a powerful and extensible\n"
 "tool to rename multiple files at once."
@@ -1723,30 +1924,30 @@ msgstr ""
 "O renomeador masivo do Thunar é unha ferramenta potente\n"
 "e extensíbel para renomear múltiplos ficheiros dunha vez."
 
-#: ../thunar/thunar-renamer-dialog.c:1556
+#: ../thunar/thunar-renamer-dialog.c:1549
 msgid "Remove File"
 msgid_plural "Remove Files"
 msgstr[0] "Eliminar ficheiro"
 msgstr[1] "Eliminar ficheiros"
 
-#: ../thunar/thunar-renamer-dialog.c:1558
+#: ../thunar/thunar-renamer-dialog.c:1551
 msgid "Remove the selected file from the list of files to be renamed"
 msgid_plural "Remove the selected files from the list of files to be renamed"
-msgstr[0] ""
-"Elimina o ficheiro seleccionado da listaxe de ficheiros a renomear"
+msgstr[0] "Elimina o ficheiro seleccionado da listaxe de ficheiros a renomear"
 msgstr[1] ""
 "Elimina o ficheiros seleccionados da listaxe de ficheiros a renomear"
 
-#: ../thunar/thunar-renamer-dialog.c:1709
+#. change title to reflect the standalone status
+#: ../thunar/thunar-renamer-dialog.c:1702
 msgid "Bulk Rename - Rename Multiple Files"
 msgstr "Renomeador masivo - renomea múltiplos ficheiros"
 
-#: ../thunar/thunar-renamer-progress.c:213
+#: ../thunar/thunar-renamer-progress.c:214
 #, c-format
 msgid "Failed to rename \"%s\" to \"%s\"."
 msgstr "Non se puido renomear «%s» a «%s»."
 
-#: ../thunar/thunar-renamer-progress.c:220
+#: ../thunar/thunar-renamer-progress.c:221
 msgid ""
 "You can either choose to skip this file and continue to rename the remaining "
 "files, or revert the previously renamed files to their previous names, or "
@@ -1756,134 +1957,149 @@ msgstr ""
 "restantes, retorna-los ficheiros renomeados ós seus nomes anteriores, ou "
 "cancela-la operación sen desface-las modificacións xa realizadas."
 
-#: ../thunar/thunar-renamer-progress.c:225
+#: ../thunar/thunar-renamer-progress.c:226
 msgid "_Revert Changes"
 msgstr "Desface_r modificacións"
 
-#: ../thunar/thunar-renamer-progress.c:226
-#: ../thunar/thunar-renamer-progress.c:235
+#: ../thunar/thunar-renamer-progress.c:227
+#: ../thunar/thunar-renamer-progress.c:236
 msgid "_Skip This File"
 msgstr "_Omitir este ficheiro"
 
-#: ../thunar/thunar-renamer-progress.c:232
+#: ../thunar/thunar-renamer-progress.c:233
 msgid ""
 "Do you want to skip this file and continue to rename the remaining files?"
 msgstr ""
 "¿Desexa omitir este ficheiro e continuar a renomea-los ficheiros restantes?"
 
-#: ../thunar/thunar-shortcuts-pane.c:96 ../thunar/thunar-shortcuts-pane.c:411
-msgid "Add Folder to _Shortcuts"
-msgid_plural "Add Folders to _Shortcuts"
-msgstr[0] "Engadi-lo cartafol a atallo_s"
-msgstr[1] "Engadi-los cartafoles a atallo_s"
+#: ../thunar/thunar-shortcuts-pane.c:413
+#, fuzzy
+msgid "Side Pane (Create Shortcut)"
+msgid_plural "Side Pane (Create Shortcuts)"
+msgstr[0] "Re_nomear atallo"
+msgstr[1] "Re_nomear atallo"
 
-#: ../thunar/thunar-shortcuts-pane.c:96 ../thunar/thunar-shortcuts-pane.c:413
+#: ../thunar/thunar-shortcuts-pane.c:415
 msgid "Add the selected folder to the shortcuts side pane"
 msgid_plural "Add the selected folders to the shortcuts side pane"
 msgstr[0] "Engade o cartafol seleccionado ó panel lateral de atallos"
 msgstr[1] "Engade os cartafoles seleccionados ó panel lateral de atallos"
 
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#. append the "Mount Volume" menu action
+#: ../thunar/thunar-shortcuts-view.c:821 ../thunar/thunar-tree-view.c:1042
 msgid "_Mount Volume"
 msgstr "_Monta-lo volume"
 
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#. append the "Eject Volume" menu action
+#: ../thunar/thunar-shortcuts-view.c:831 ../thunar/thunar-tree-view.c:1052
 msgid "E_ject Volume"
 msgstr "E_xtrae-lo volume"
 
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#. append the "Unmount Volume" menu item
+#: ../thunar/thunar-shortcuts-view.c:840 ../thunar/thunar-tree-view.c:1061
 msgid "_Unmount Volume"
 msgstr "Desmonta-lo vol_ume"
 
-#: ../thunar/thunar-shortcuts-view.c:852
+#. append the remove menu item
+#: ../thunar/thunar-shortcuts-view.c:868
 msgid "_Remove Shortcut"
 msgstr "Elimina_r atallo"
 
-#: ../thunar/thunar-shortcuts-view.c:867
+#. append the rename menu item
+#: ../thunar/thunar-shortcuts-view.c:883
 msgid "Re_name Shortcut"
 msgstr "Re_nomear atallo"
 
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1156
 #, c-format
 msgid "The path \"%s\" does not refer to a directory"
 msgstr "A rota «%s» non apunta a ningún directorio"
 
-#: ../thunar/thunar-shortcuts-view.c:1159
+#. display an error message to the user
+#: ../thunar/thunar-shortcuts-view.c:1175
 msgid "Failed to add new shortcut"
 msgstr "Non se puido engadir un novo atallo"
 
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#. display an error dialog to inform the user
+#: ../thunar/thunar-shortcuts-view.c:1293 ../thunar/thunar-tree-view.c:1556
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Non se puido extraer «%s»"
 
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#. display an error dialog to inform the user
+#: ../thunar/thunar-shortcuts-view.c:1339 ../thunar/thunar-tree-view.c:950
+#: ../thunar/thunar-tree-view.c:1607
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Non se puido montar «%s»"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1383 ../thunar/thunar-tree-view.c:1747
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Non se puido desmontar «%s»"
 
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:177
 msgid "Click here to stop calculating the total size of the folder."
 msgstr "Prema aquí para dete-lo cálculo do tamaño total do cartafol."
 
-#: ../thunar/thunar-size-label.c:306
+#. tell the user that the operation was canceled
+#: ../thunar/thunar-size-label.c:298
 msgid "Calculation aborted"
 msgstr "Cálculo interrompido"
 
-#: ../thunar/thunar-size-label.c:413
+#. tell the user that we started calculation
+#: ../thunar/thunar-size-label.c:405
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:415
 #, c-format
 msgid "%s Bytes"
 msgstr "%s bytes"
 
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:507
 #, c-format
 msgid "%u item, totalling %s"
 msgid_plural "%u items, totalling %s"
 msgstr[0] "%u elemento, sumando %s"
 msgstr[1] "%u elementos, sumando %s"
 
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:315
 msgid "Folder Context Menu"
 msgstr "Menú contextual do cartafol"
 
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:316
 msgid "Create an empty folder within the current folder"
 msgstr "Crear un cartafol baleiro dentro do cartafol actual"
 
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#. append the "Cut" menu action
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1113
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#. append the "Copy" menu action
+#: ../thunar/thunar-standard-view.c:319 ../thunar/thunar-tree-view.c:1125
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:320
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:320
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr ""
 "Move ou copia ficheiros previamente seleccionados por unha instrución "
 "«Cortar» ou «Copiar»"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#. append the "Delete" menu action
+#: ../thunar/thunar-standard-view.c:321 ../thunar/thunar-tree-view.c:1160
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:322
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
@@ -1891,117 +2107,104 @@ msgstr ""
 "Move ou copia ficheiros previamente seleccionados por unha instrución "
 "«Cortar» ou «Copiar» dentro do cartafol seleccionado"
 
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:323
 msgid "Select _all Files"
 msgstr "Seleccion_ar tódolos ficheiros"
 
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:323
 msgid "Select all files in this window"
 msgstr "Seleccionar tódolos ficheiros desta xanela"
 
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:324
 msgid "Select _by Pattern..."
 msgstr "Seleccionar _usando un patrón..."
 
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:324
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona tódolos ficheiros que coinciden cun certo patrón"
 
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:325
 msgid "Du_plicate"
 msgstr "Du_plicar"
 
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3384
+#: ../thunar/thunar-standard-view.c:326 ../thunar/thunar-standard-view.c:3371
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crear unha _ligazón"
 msgstr[1] "Crear unhas _ligazóns"
 
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:327
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Renomea-lo ficheiro seleccionado"
+#: ../thunar/thunar-standard-view.c:328
+msgid "_Restore"
+msgstr ""
 
-#: ../thunar/thunar-standard-view.c:582
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:588
 msgid "Create _Document"
 msgstr "Crear _documento"
 
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1263
 msgid "Loading folder contents..."
 msgstr "Cargando o contido do cartafol..."
 
-#: ../thunar/thunar-standard-view.c:1739
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1734
 msgid "New Empty File"
 msgstr "Novo ficheiro baleiro"
 
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1734
 msgid "New Empty File..."
 msgstr "Novo ficheiro baleiro..."
 
-#: ../thunar/thunar-standard-view.c:1839
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1834
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Crear un documento a partir do modelo «%s»"
 
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"¿Tén a certeza de querer eliminar\n"
-"permanentemente «%s»?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"¿Tén a certeza de querer eliminar permanentemente\n"
-"o ficheiro seleccionado?"
-msgstr[1] ""
-"¿Tén a certeza de querer eliminar permanentemente\n"
-"os %u ficheiros seleccionados?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Se elimina un ficheiro, será de forma permanente."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2029
 msgid "Select by Pattern"
 msgstr "Seleccionar usando un patrón"
 
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2035
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2044
 msgid "_Pattern:"
 msgstr "_Patrón:"
 
-#: ../thunar/thunar-standard-view.c:2231
+#. create a new dialog window
+#: ../thunar/thunar-standard-view.c:2178
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Renomear «%s»"
 
-#: ../thunar/thunar-standard-view.c:2736
+#: ../thunar/thunar-standard-view.c:2186
+#, fuzzy
+msgid "_Rename"
+msgstr "Renomear"
+
+#. tell the user that the file name provided by the X Direct Save source is invalid
+#: ../thunar/thunar-standard-view.c:2535
+msgid "Invalid filename provided by XDS drag site"
+msgstr ""
+
+#. display an error dialog to the user
+#: ../thunar/thunar-standard-view.c:2712
 #, c-format
 msgid "Failed to create a link for the URL \"%s\""
 msgstr "Non se puido crear unha ligazón ó URL «%s»"
 
-#: ../thunar/thunar-standard-view.c:2999
+#: ../thunar/thunar-standard-view.c:2975
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Non se puido abri-lo directorio «%s»"
 
-#: ../thunar/thunar-standard-view.c:3344
+#: ../thunar/thunar-standard-view.c:3331
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
@@ -2010,7 +2213,7 @@ msgstr[1] ""
 "Prepara-los ficheiros seleccionados para mover mediante unha instrución de "
 "Pegar"
 
-#: ../thunar/thunar-standard-view.c:3352
+#: ../thunar/thunar-standard-view.c:3339
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
@@ -2020,284 +2223,310 @@ msgstr[1] ""
 "Prepara-los ficheiros seleccionados para copiar mediante unha instrución de "
 "Pegar"
 
-#: ../thunar/thunar-standard-view.c:3363
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Elimina-lo ficheiro seleccionado permanentemente"
-msgstr[1] "Elimina-los ficheiros seleccionados permanentemente"
+#: ../thunar/thunar-standard-view.c:3350
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplica-lo ficheiro seleccionado"
+msgstr[1] "Duplicar cada ficheiro seleccionado"
 
-#: ../thunar/thunar-standard-view.c:3377
+#: ../thunar/thunar-standard-view.c:3364
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Duplica-lo ficheiro seleccionado"
 msgstr[1] "Duplicar cada ficheiro seleccionado"
 
-#: ../thunar/thunar-standard-view.c:3386
+#: ../thunar/thunar-standard-view.c:3373
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "Crear unha ligazón simbólico para o ficheiro seleccionado"
 msgstr[1] "Crear unha ligazón simbólica para cada ficheiro seleccionado"
 
-#: ../thunar/thunar-stock.c:55
-msgid "Create"
-msgstr "Crear"
-
-#: ../thunar/thunar-stock.c:56
-msgid "Rename"
-msgstr "Renomear"
-
-#: ../thunar/thunar-templates-action.c:375
+#: ../thunar/thunar-standard-view.c:3381
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Renomea-lo ficheiro seleccionado"
+msgstr[1] "Renomea-lo ficheiro seleccionado"
+
+#: ../thunar/thunar-standard-view.c:3389
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Renomea-lo ficheiro seleccionado"
+msgstr[1] "Renomea-lo ficheiro seleccionado"
+
+#. tell the user that no templates were found
+#: ../thunar/thunar-templates-action.c:376
 msgid "No Templates installed"
 msgstr "No se instalou ningún modelo"
 
-#: ../thunar/thunar-templates-action.c:387
+#. add the "Empty File" item
+#: ../thunar/thunar-templates-action.c:388
 msgid "_Empty File"
 msgstr "Ficheiro _baleiro"
 
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:596
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../thunar/thunar-tree-view.c:1122
+#. append the "Paste Into Folder" menu action
+#: ../thunar/thunar-tree-view.c:1142
 msgid "_Paste Into Folder"
 msgstr "_Pegar dentro do cartafol"
 
-#: ../thunar/thunar-tree-view.c:1163
+#. append the "Properties" menu action
+#: ../thunar/thunar-tree-view.c:1183
 msgid "P_roperties..."
 msgstr "P_ropiedades..."
 
-#: ../thunar/thunar-window.c:253
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:108
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:113
+msgid "Yesterday"
+msgstr ""
+
+#: ../thunar/thunar-window.c:254
 msgid "Open New _Window"
 msgstr "Abrir unha no_va xanela"
 
-#: ../thunar/thunar-window.c:253
+#: ../thunar/thunar-window.c:254
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Abrir unha nova xanela do Thunar para a localización amosada"
 
-#: ../thunar/thunar-window.c:254
+#: ../thunar/thunar-window.c:256
 msgid "Close _All Windows"
 msgstr "Pechar _tódalas xanelas"
 
-#: ../thunar/thunar-window.c:254
+#: ../thunar/thunar-window.c:256
 msgid "Close all Thunar windows"
 msgstr "Pechar tódalas xanelas do Thunar"
 
-#: ../thunar/thunar-window.c:255
+#: ../thunar/thunar-window.c:257
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../thunar/thunar-window.c:255
+#: ../thunar/thunar-window.c:257
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
-#: ../thunar/thunar-window.c:256
+#: ../thunar/thunar-window.c:258
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:257
+#: ../thunar/thunar-window.c:259
 msgid "Pr_eferences..."
 msgstr "Pr_eferencias..."
 
-#: ../thunar/thunar-window.c:257
+#: ../thunar/thunar-window.c:259
 msgid "Edit Thunars Preferences"
 msgstr "Editar preferencias do Thunar"
 
-#: ../thunar/thunar-window.c:258
+#: ../thunar/thunar-window.c:260
 msgid "_View"
 msgstr "_Ver"
 
-#: ../thunar/thunar-window.c:259
+#: ../thunar/thunar-window.c:261
 msgid "_Reload"
 msgstr "Actualiza_r"
 
-#: ../thunar/thunar-window.c:259
+#: ../thunar/thunar-window.c:261
 msgid "Reload the current folder"
 msgstr "Actualiza-lo cartafol actual"
 
-#: ../thunar/thunar-window.c:260
+#: ../thunar/thunar-window.c:262
 msgid "_Location Selector"
 msgstr "Selector de _localizacións"
 
-#: ../thunar/thunar-window.c:261
+#: ../thunar/thunar-window.c:263
 msgid "_Side Pane"
 msgstr "Panel _lateral"
 
-#: ../thunar/thunar-window.c:262
+#: ../thunar/thunar-window.c:264
 msgid "Zoom _In"
 msgstr "Ampl_iar"
 
-#: ../thunar/thunar-window.c:262
+#: ../thunar/thunar-window.c:264
 msgid "Show the contents in more detail"
 msgstr "Amosa-los contidos con máis detalle"
 
-#: ../thunar/thunar-window.c:263
+#: ../thunar/thunar-window.c:265
 msgid "Zoom _Out"
 msgstr "Re_ducir"
 
-#: ../thunar/thunar-window.c:263
+#: ../thunar/thunar-window.c:265
 msgid "Show the contents in less detail"
 msgstr "Amosa-los contidos con menos detalle"
 
-#: ../thunar/thunar-window.c:264
+#: ../thunar/thunar-window.c:266
 msgid "Normal Si_ze"
 msgstr "Tamaño nor_mal"
 
-#: ../thunar/thunar-window.c:264
+#: ../thunar/thunar-window.c:266
 msgid "Show the contents at the normal size"
 msgstr "Amosa-los contidos a tamaño normal"
 
-#: ../thunar/thunar-window.c:265
+#: ../thunar/thunar-window.c:267
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../thunar/thunar-window.c:266
+#: ../thunar/thunar-window.c:268
 msgid "Open _Parent"
 msgstr "Abrir ant_ecesor"
 
-#: ../thunar/thunar-window.c:266
+#: ../thunar/thunar-window.c:268
 msgid "Open the parent folder"
 msgstr "Abre o cartafol antecesor"
 
-#: ../thunar/thunar-window.c:267
+#: ../thunar/thunar-window.c:269
 msgid "_Home"
 msgstr "Cartafol _persoal"
 
-#: ../thunar/thunar-window.c:267
+#: ../thunar/thunar-window.c:269
 msgid "Go to the home folder"
 msgstr "Ir ó cartafol persoal"
 
-#: ../thunar/thunar-window.c:268
+#: ../thunar/thunar-window.c:270
 msgid "T_emplates"
 msgstr "_Modelos"
 
-#: ../thunar/thunar-window.c:268
+#: ../thunar/thunar-window.c:270
 msgid "Go to the templates folder"
 msgstr "Ir ó cartafol de modelos"
 
-#: ../thunar/thunar-window.c:269
+#: ../thunar/thunar-window.c:271
 msgid "Open _Location..."
 msgstr "Abrir _localización..."
 
-#: ../thunar/thunar-window.c:269
+#: ../thunar/thunar-window.c:271
 msgid "Specify a location to open"
 msgstr "Especifique unha localización para abrir"
 
-#: ../thunar/thunar-window.c:270
+#: ../thunar/thunar-window.c:272
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../thunar/thunar-window.c:271
+#: ../thunar/thunar-window.c:273
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../thunar/thunar-window.c:271
+#: ../thunar/thunar-window.c:273
 msgid "Display Thunar user manual"
 msgstr "Amosa o manual de usuario do Thunar"
 
-#: ../thunar/thunar-window.c:272
+#: ../thunar/thunar-window.c:274
 msgid "Display information about Thunar"
 msgstr "Amosa información sobre o Thunar"
 
-#: ../thunar/thunar-window.c:277
+#: ../thunar/thunar-window.c:279
 msgid "Show _Hidden Files"
 msgstr "Amosa-los fic_heiros agochados"
 
-#: ../thunar/thunar-window.c:277
+#: ../thunar/thunar-window.c:279
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Troca a visibilidade dos ficheiros agochados na xanela actual"
 
-#: ../thunar/thunar-window.c:278
+#: ../thunar/thunar-window.c:280
 msgid "_Shortcuts"
 msgstr "Atallo_s"
 
-#: ../thunar/thunar-window.c:278
+#: ../thunar/thunar-window.c:280
 msgid "Toggles the visibility of the shortcuts pane"
 msgstr "Troca a visibilidade do panel de atallos"
 
-#: ../thunar/thunar-window.c:279
+#: ../thunar/thunar-window.c:281
 msgid "_Tree"
 msgstr "_Árbore"
 
-#: ../thunar/thunar-window.c:279
+#: ../thunar/thunar-window.c:281
 msgid "Toggles the visibility of the tree pane"
 msgstr "Troca a visibilidade do panel arborescente"
 
-#: ../thunar/thunar-window.c:280
+#: ../thunar/thunar-window.c:282
 msgid "St_atusbar"
 msgstr "B_arra de estado"
 
-#: ../thunar/thunar-window.c:280
+#: ../thunar/thunar-window.c:282
 msgid "Change the visibility of this window's statusbar"
 msgstr "Muda a visibilidade da barra de estado da xanela"
 
-#. 
-#: ../thunar/thunar-window.c:581
+#.
+#. * add the location selector options
+#.
+#: ../thunar/thunar-window.c:583
 msgid "_Pathbar Style"
 msgstr "Estilo da barra de _direccións"
 
-#: ../thunar/thunar-window.c:582
+#: ../thunar/thunar-window.c:584
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Enfoque moderno con botóns que corresponden a cartafoles"
 
-#: ../thunar/thunar-window.c:588
+#: ../thunar/thunar-window.c:590
 msgid "_Toolbar Style"
 msgstr "Es_tilo da barra de ferramentas"
 
-#: ../thunar/thunar-window.c:589
+#: ../thunar/thunar-window.c:591
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Enfoque tradicional con barra de direccións e botóns de navegación"
 
-#: ../thunar/thunar-window.c:595
+#: ../thunar/thunar-window.c:597
 msgid "_Hidden"
 msgstr "A_gochada"
 
-#: ../thunar/thunar-window.c:595
+#: ../thunar/thunar-window.c:597
 msgid "Don't display any location selector"
 msgstr "Non amosar ningún selector de localización"
 
-#. 
-#: ../thunar/thunar-window.c:604
+#.
+#. * add view options
+#.
+#: ../thunar/thunar-window.c:606
 msgid "View as _Icons"
 msgstr "Ver coma _iconas"
 
-#: ../thunar/thunar-window.c:604
+#: ../thunar/thunar-window.c:606
 msgid "Display folder content in an icon view"
 msgstr "Amosa-lo contido do cartafol nunha vista de iconas"
 
-#: ../thunar/thunar-window.c:611
+#: ../thunar/thunar-window.c:613
 msgid "View as _Detailed List"
 msgstr "Ver coma listaxe _detallada"
 
-#: ../thunar/thunar-window.c:611
+#: ../thunar/thunar-window.c:613
 msgid "Display folder content in a detailed list view"
 msgstr "Amosa-lo contido do cartafol coma unha listaxe detallada"
 
-#: ../thunar/thunar-window.c:618
+#: ../thunar/thunar-window.c:620
 msgid "View as _Compact List"
 msgstr "Ver coma listaxe _compacta"
 
-#: ../thunar/thunar-window.c:618
+#: ../thunar/thunar-window.c:620
 msgid "Display folder content in a compact list view"
 msgstr "Amosa-lo contido do cartafol coma unha listaxe compacta"
 
-#: ../thunar/thunar-window.c:1638
+#: ../thunar/thunar-window.c:1640
 msgid "Failed to open parent folder"
 msgstr "Non se puido abri-lo cartafol antecesor"
 
-#: ../thunar/thunar-window.c:1664
+#. display an error to the user
+#: ../thunar/thunar-window.c:1666
 msgid "Failed to open home directory"
 msgstr "Non se puido abri-lo cartafol persoal"
 
-#: ../thunar/thunar-window.c:1726
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1728
 msgid "About Templates"
 msgstr "Sobre os modelos"
 
-#: ../thunar/thunar-window.c:1747
+#: ../thunar/thunar-window.c:1749
 msgid "All files in this folder will appear in the \"Create Document\" menu."
-msgstr ""
-"Tódolos ficheiros deste cartafol aparecerán no menú «Crear documento»."
+msgstr "Tódolos ficheiros deste cartafol aparecerán no menú «Crear documento»."
 
-#: ../thunar/thunar-window.c:1754
+#: ../thunar/thunar-window.c:1756
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -2313,15 +2542,15 @@ msgstr ""
 "Logo pode selecciona-la entrada do menú «Crear documento» e crearase unha "
 "copia do documento no cartafol no que estea situado."
 
-#: ../thunar/thunar-window.c:1766
+#: ../thunar/thunar-window.c:1768
 msgid "Do _not display this message again"
 msgstr "_Non amosar esta mensaxe de novo"
 
-#: ../thunar/thunar-window.c:1779
+#: ../thunar/thunar-window.c:1781
 msgid "Failed to open templates folder"
 msgstr "Non se puido abri-lo cartafol de modelos"
 
-#: ../thunar/thunar-window.c:1815
+#: ../thunar/thunar-window.c:1817
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -2485,22 +2714,23 @@ msgid "Shutter Speed:"
 msgstr "Velocidade do obturador:"
 
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
 msgid "Software:"
 msgstr "Software:"
 
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
 msgid "Image Type:"
 msgstr "Tipo de imaxe:"
 
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Tamaño da imaxe:"
-
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
 #, c-format
 msgid "%dx%d pixel"
 msgid_plural "%dx%d pixels"
@@ -2609,11 +2839,13 @@ msgid "Numbering"
 msgstr "Numeración"
 
 #: ../plugins/thunar-sbr/thunar-sbr-remove-renamer.c:177
-msgid "Remove _From Positon:"
+#, fuzzy
+msgid "Remove _From Position:"
 msgstr "Eliminar _dende a posición:"
 
 #: ../plugins/thunar-sbr/thunar-sbr-remove-renamer.c:212
-msgid "_To Positon:"
+#, fuzzy
+msgid "_To Position:"
 msgstr "Á _posición:"
 
 #: ../plugins/thunar-sbr/thunar-sbr-remove-renamer.c:428
@@ -2624,6 +2856,7 @@ msgstr "Elimina_r caracteres"
 msgid "_Search For:"
 msgstr "_Procurar por:"
 
+#. reset to default tooltip
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:217
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:652
 msgid "Enter the text to search for in the file names."
@@ -2666,6 +2899,7 @@ msgstr ""
 "Se habilita esta opción, procurarase o patrón diferenciando entre maiúsculas "
 "e minúsculas. De xeito predeterminado, non se fai distición."
 
+#. setup a tooltip with the error message
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:620
 #, c-format
 msgid "Invalid regular expression, at character position %ld: %s"
@@ -2675,6 +2909,115 @@ msgstr "Expresión regular non válida, na posición do carácter %ld: %s"
 msgid "Search & Replace"
 msgstr "Procurar e substituír"
 
+#: ../plugins/thunar-sendto-email/main.c:176
+#, c-format
+msgid "Send \"%s\" as compressed archive?"
+msgstr ""
+
+#: ../plugins/thunar-sendto-email/main.c:178
+#: ../plugins/thunar-sendto-email/main.c:197
+msgid "Send _directly"
+msgstr ""
+
+#: ../plugins/thunar-sendto-email/main.c:179
+msgid "Send com_pressed"
+msgstr ""
+
+#: ../plugins/thunar-sendto-email/main.c:181
+msgid ""
+"When sending a file via email, you can either choose to send the file "
+"directly, as is, or compress the file before attaching it to an email. It is "
+"highly recommended to compress large files before sending them."
+msgstr ""
+
+#: ../plugins/thunar-sendto-email/main.c:192
+#, c-format
+msgid "Send %d file as compressed archive?"
+msgid_plural "Send %d files as compressed archive?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/thunar-sendto-email/main.c:198
+msgid "Send as _archive"
+msgstr ""
+
+#: ../plugins/thunar-sendto-email/main.c:200
+msgid ""
+"When sending multiple files via email, you can either choose to send the "
+"files directly, attaching multiple files to an email, or send all files "
+"compressed into a single archive file and attach the archive. It is highly "
+"recommended to send multiple large files as archive."
+msgstr ""
+
+#. allocate the progress dialog
+#. setup the label
+#: ../plugins/thunar-sendto-email/main.c:249
+#: ../plugins/thunar-sendto-email/main.c:274
+#, fuzzy
+msgid "Compressing files..."
+msgstr "Copiando ficheiros..."
+
+#. tell the user that the command failed
+#: ../plugins/thunar-sendto-email/main.c:299
+#, c-format
+msgid "ZIP command terminated with error %d"
+msgstr ""
+
+#: ../plugins/thunar-sendto-email/main.c:385
+#, fuzzy
+msgid "Failed to create temporary directory"
+msgstr "Non se puido crea-lo directorio «%s»"
+
+#: ../plugins/thunar-sendto-email/main.c:436
+#, fuzzy, c-format
+msgid "Failed to create symbolic link for \"%s\""
+msgstr "Non se puido crea-la ligazón simbólica «%s»"
+
+#. tell the user that we failed to compress the file(s)
+#: ../plugins/thunar-sendto-email/main.c:459
+#, fuzzy, c-format
+msgid "Failed to compress %d file"
+msgid_plural "Failed to compress %d files"
+msgstr[0] "Non se puido abrir %d ficheiro"
+msgstr[1] "Non se puideron abrir %d ficheiros"
+
+#. tell the user that we failed
+#: ../plugins/thunar-sendto-email/main.c:600
+#, fuzzy
+msgid "Failed to compose new email"
+msgstr "Non se puido abrir %d ficheiro"
+
+#: ../plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in.h:1
+msgid "Mail Recipient"
+msgstr ""
+
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Non se puido conectar co daemon HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
 #: ../plugins/thunar-uca/thunar-uca-chooser.c:125
 msgid "Custom Actions"
 msgstr "Accións personalizadas"
@@ -2719,24 +3062,26 @@ msgstr "Crear acción"
 msgid "Failed to save actions to disk."
 msgstr "Non se puideron garda-las acciones no disco."
 
-#. 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#.
+#. Basic
+#.
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Básico"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "O nome da acción que se amosará no menú contextual."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Descrición:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -2744,11 +3089,11 @@ msgstr ""
 "A descrición da acción que se amosará na barra de estado cando se seleccione "
 "un elemento dende o menú contextual."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "Instru_ción:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -2764,23 +3109,23 @@ msgstr ""
 "seleccionan varios elementos. Pola contra, se usa minúsculas, a acción só se "
 "executará se se selecciona exactamente un elemento."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
-msgid ""
-"Browse the file system to select an application to use for this action."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
+msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Explora-lo sistema de ficheiros para escoller unha aplicación a usar para "
 "esta acción."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Icona:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#. setup a label to tell that no icon was selected
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Sen icona"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -2788,7 +3133,7 @@ msgstr ""
 "Preme este botón para escoller unha icona que se amosará no menú contextual "
 "ademais do nome da acción escollida antes."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -2796,81 +3141,81 @@ msgstr ""
 "Os seguintes parámetros serán substituídos\n"
 "ó executa-la acción:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "a rota ó primeiro ficheiro seleccionado"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "as rotas a tódolos ficheiros seleccionados"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "directorio que contén o ficheiro indicado en %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "directorios que conteñen os ficheiros indicados en %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "o primeiro nome do ficheiro seleccionado (sen a rota)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "os nomes de ficheiros seleccionados (sen as rotas)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Condicións de aspecto"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "Patrón de _ficheiro:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
-"pattern here, the list items must be separated with semicolons (e.g. "
-"*.txt;*.doc)."
+"pattern here, the list items must be separated with semicolons (e.g. *.txt;*."
+"doc)."
 msgstr ""
 "Introduza unha listaxe de patróns a usar para saber se se debe amosar esta "
 "acción para un ficheiro seleccionado. Se especifica aquí máis dun patrón, a "
 "listaxe de elementos debe de usar puntos e vírgulas coma separadores (por "
 "exemplo: *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Aparece se a selección contén:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Directorios"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Ficheiros de audio"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Ficheiros de _imaxe"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Ficheiros de _texto"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Ficheiros de _vídeo"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Outros ficheiros"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -2894,8 +3239,10 @@ msgstr ""
 "cartafol. Ademais, pode especificar que a acción\n"
 "só deba aparecer para certos tipos de ficheiros."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Escolla unha icona"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
@@ -2913,11 +3260,11 @@ msgstr ""
 msgid "Unknown closing element <%s>"
 msgstr "Elemento descoñecido de peche <%s>"
 
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
 msgid "Failed to determine save location for uca.xml"
 msgstr "Non se puido determina-la localización onde se garda uca.xml"
 
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
 msgid "Command not configured"
 msgstr "Instrución non configurada"
 
@@ -2967,4 +3314,74 @@ msgstr "Abrir cartafol co Thunar"
 
 #: ../Thunar-folder-handler.desktop.in.in.h:3
 msgid "Open the specified folders in Thunar"
-msgstr "Abri-los cartafoles especificados no Thunar"
\ No newline at end of file
+msgstr "Abri-los cartafoles especificados no Thunar"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Non se puido determina-la información do ficheiro «%s»: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "O ficheiro «%s» xa existe. ¿Desexa substituílo por un ficheiro baleiro?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Non se puido eliminar «%s».\n"
+#~ "\n"
+#~ "¿Desexa omitir este paso?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Non se puido crea-lo ficheiro baleiro «%s».\n"
+#~ "\n"
+#~ "¿Desexa omitir este paso?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Non se puido executar 'stat' sobre o ficheiro «%s»: %s"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Non se puido crea-lo directorio «%s»: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Eliminando directorios..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Non se puido elimina-lo directorio «%s»: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Non se pode transferi-lo directorio raíz"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operación cancelada"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Non se puido le-lo destino da ligazón dende «%s»"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Non se puido muda-lo modo de «%s»"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Non se puido copia-lo ficheiro especial «%s»"
+
+#~ msgid "Open the selected directories in new Thunar windows"
+#~ msgstr "Abre os directorios seleccionados nunha nova xanela do Thunar"
+
+#~ msgid "Choose a program with which to open the selected file"
+#~ msgstr "Escolla un programa para abri-lo ficheiro seleccionado"
+
+#~ msgid "Add Folder to _Shortcuts"
+#~ msgid_plural "Add Folders to _Shortcuts"
+#~ msgstr[0] "Engadi-lo cartafol a atallo_s"
+#~ msgstr[1] "Engadi-los cartafoles a atallo_s"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Elimina-lo ficheiro seleccionado permanentemente"
+#~ msgstr[1] "Elimina-los ficheiros seleccionados permanentemente"
diff --git a/po/he.po b/po/he.po
index 7f02446db86fb65fbb7807bb01e615e856580b2b..85194b6632321964e1ae36f4fd8b4b8d8b577b63 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-05-05 22:28+0300\n"
 "Last-Translator: Yuval Tanny <tanai@int.gov.il>\n"
 "Language-Team: Hebrew\n"
@@ -706,39 +706,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "בחר תוכנה"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "כל הקבצים"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "קבצי ריצה"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "תסריטי Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "תסריטי Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "תסריטי Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "תסריטי Shell"
 
@@ -831,6 +830,7 @@ msgstr "ה_רחב את גדלי העמודות אוטומטית לפי הצור
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "לא ידוע"
 
@@ -995,7 +995,7 @@ msgstr "קדימה"
 msgid "Go to the next visited folder"
 msgstr "עבור לתיקייה הבאה בה צפית"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1861,7 +1861,6 @@ msgid "Audio Files"
 msgstr "קבצי קול"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "קבצי תמונה"
 
@@ -2993,33 +2992,33 @@ msgstr "לא יכול לשמור את הפעולות לדיסק."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "בסיסי"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_שם:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "שם הפעולה שיוצג בתפריט."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_תיאור:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_פקודה:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3029,67 +3028,67 @@ msgid ""
 "if exactly one item is selected."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "עיין במערכת הקבצים כדי לבחור תוכנה לשימוש בפעולה זאת."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_סמל:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "אין סמל"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "תנאי הופעה"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3097,35 +3096,35 @@ msgid ""
 "doc)."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "מופיע אם הבחירה כוללת:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_ספריות"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "קבצי _קול"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_קבצי תמונה"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "קבצי _טקסט"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "קבצי _וידאו"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "קבצים _אחרים"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3139,8 +3138,10 @@ msgid ""
 "files."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "בחר סמל"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/hu.po b/po/hu.po
index ea9439e1d5a1736ef0b4735508fd615095ced39b..d8ab9b7344853031de446967062ce1894cb0a7f0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-13 08:45+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -37,8 +37,7 @@ msgstr "Nincs Exec mező megadva"
 msgid "No URL field specified"
 msgstr "Nincs URL megadva"
 
-#: ../thunar-vfs/thunar-vfs-info.c:362
-#: ../thunar-vfs/thunar-vfs-io-local.c:870
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:870
 msgid "Invalid desktop file"
 msgstr "Hibás .desktop fájl"
 
@@ -107,8 +106,7 @@ msgstr "Nem tudok adatot írni ide: \"%s\""
 #. display an error to the user
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:234
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:297
-#: ../thunar-vfs/thunar-vfs-io-ops.c:496
-#: ../thunar/thunar-chooser-dialog.c:787
+#: ../thunar-vfs/thunar-vfs-io-ops.c:496 ../thunar/thunar-chooser-dialog.c:787
 #, c-format
 msgid "Failed to remove \"%s\""
 msgstr "Nem törölhető: \"%s\""
@@ -124,8 +122,7 @@ msgid "copy of %s"
 msgstr "%s másolata"
 
 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
-#: ../thunar/thunar-list-model.c:777
-#: ../thunar/thunar-properties-dialog.c:762
+#: ../thunar/thunar-list-model.c:777 ../thunar/thunar-properties-dialog.c:762
 #, c-format
 msgid "link to %s"
 msgstr "lánc ehhez: %s"
@@ -282,8 +279,7 @@ msgid "The icon of the mime handler"
 msgstr "A mime kezelő ikonja"
 
 #: ../thunar-vfs/thunar-vfs-mime-handler.c:174
-#: ../thunar/thunar-enum-types.c:94
-#: ../thunar/thunar-renamer-dialog.c:427
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:427
 #: ../thunarx/thunarx-renamer.c:177
 msgid "Name"
 msgstr "Név"
@@ -319,8 +315,7 @@ msgstr "A művelet nem támogatott"
 msgid "Invalidly escaped characters"
 msgstr "Érvénytelen 'escape' karakterek"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:222
-#: ../thunar/thunar-enum-types.c:97
+#: ../thunar-vfs/thunar-vfs-thumb.c:222 ../thunar/thunar-enum-types.c:97
 msgid "Size"
 msgstr "Méret"
 
@@ -468,8 +463,7 @@ msgid "Sort items in descending order"
 msgstr "Az elemeket csökkenően rendezi"
 
 #. display an error message to the user
-#: ../thunar/thunar-application.c:361
-#: ../thunar/thunar-application.c:405
+#: ../thunar/thunar-application.c:361 ../thunar/thunar-application.c:405
 msgid "Failed to launch operation"
 msgstr "Nem sikerült a művelet indítása"
 
@@ -484,8 +478,7 @@ msgstr "Nem sikerült megnyitni ezt: \"%s\""
 msgid "Failed to open \"%s\": %s"
 msgstr "\"%s\" megnyitása sikertelen: %s"
 
-#: ../thunar/thunar-application.c:907
-#: ../thunar/thunar-application.c:940
+#: ../thunar/thunar-application.c:907 ../thunar/thunar-application.c:940
 msgid "Copying files..."
 msgstr "Fájlok másolása..."
 
@@ -545,14 +538,15 @@ msgstr "Mindent törölsz a kukából?"
 #. add the "Empty Trash" menu item
 #: ../thunar/thunar-application.c:1269
 #: ../thunar/thunar-location-buttons.c:1265
-#: ../thunar/thunar-shortcuts-view.c:855
-#: ../thunar/thunar-tree-view.c:1076
+#: ../thunar/thunar-shortcuts-view.c:855 ../thunar/thunar-tree-view.c:1076
 #: ../plugins/thunar-tpa/main.c:49
 msgid "_Empty Trash"
 msgstr "Ãœr_es kuka"
 
 #: ../thunar/thunar-application.c:1273
-msgid "If you choose to empty the Trash, all items in it will be permanently lost. Please note that you can also delete them separately."
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
 msgstr "A kuka kiürítésével minden eleme elvész. Ezeket külön is törölheted."
 
 #: ../thunar/thunar-application.c:1290
@@ -575,8 +569,12 @@ msgstr "Mappa lét_rehozása"
 
 #: ../thunar/thunar-application.c:1382
 #, c-format
-msgid "The folder \"%s\" does not exist anymore, but it is required to restore the file \"%s\" from the trash. Do you want to create the folder again?"
-msgstr "\"%s\" mappa már nem létezik, de \"%s\" fájl létrehozásához szükséges. Újra létrehozzuk?"
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+"\"%s\" mappa már nem létezik, de \"%s\" fájl létrehozásához szükséges. Újra "
+"létrehozzuk?"
 
 #. display an error dialog
 #: ../thunar/thunar-application.c:1419
@@ -590,8 +588,7 @@ msgstr "Fájlok visszaállítása..."
 
 #. tell the user that it didn't work
 #. display an error to the user
-#: ../thunar/thunar-chooser-button.c:275
-#: ../thunar/thunar-chooser-dialog.c:506
+#: ../thunar/thunar-chooser-button.c:275 ../thunar/thunar-chooser-dialog.c:506
 #, c-format
 msgid "Failed to set default application for \"%s\""
 msgstr "Nem sikerült beállítani az alapalkalmazást ehhez: \"%s\""
@@ -602,7 +599,8 @@ msgstr "Nincs kijelölt alkalmazás"
 
 #: ../thunar/thunar-chooser-button.c:366
 #, c-format
-msgid "The selected application is used to open this and other files of type \"%s\"."
+msgid ""
+"The selected application is used to open this and other files of type \"%s\"."
 msgstr "A kijelölt alkalmazás nyitja meg ezt és más \"%s\" típusú fájlokat."
 
 #. add the "Other Application..." choice
@@ -610,8 +608,7 @@ msgstr "A kijelölt alkalmazás nyitja meg ezt és más \"%s\" típusú fájloka
 msgid "_Other Application..."
 msgstr "Más alkalmazás..."
 
-#: ../thunar/thunar-chooser-dialog.c:220
-#: ../thunar/thunar-launcher.c:140
+#: ../thunar/thunar-chooser-dialog.c:220 ../thunar/thunar-launcher.c:140
 msgid "Open With"
 msgstr "Megnyitás ezzel:"
 
@@ -621,8 +618,12 @@ msgid "Use a _custom command:"
 msgstr "Egyéni parancs használata:"
 
 #: ../thunar/thunar-chooser-dialog.c:287
-msgid "Use a custom command for an application that is not available from the above application list."
-msgstr "Egyéni parancs használata egy a fenti alkalmazás listában nem látható alkalmazáshoz."
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Egyéni parancs használata egy a fenti alkalmazás listában nem látható "
+"alkalmazáshoz."
 
 #. create the "Custom command" button
 #: ../thunar/thunar-chooser-dialog.c:306
@@ -659,13 +660,20 @@ msgstr "<i>%s</i> és más \"%s\" típusú fájlok megnyitása ezzel:"
 
 #: ../thunar/thunar-chooser-dialog.c:713
 #, c-format
-msgid "Browse the file system to select an application to open files of type \"%s\"."
-msgstr "Böngészd a fájlrendszert \"%s\" típusú fájlokat megnyitó alkalmazás kiválasztásához."
+msgid ""
+"Browse the file system to select an application to open files of type \"%s\"."
+msgstr ""
+"Böngészd a fájlrendszert \"%s\" típusú fájlokat megnyitó alkalmazás "
+"kiválasztásához."
 
 #: ../thunar/thunar-chooser-dialog.c:719
 #, c-format
-msgid "Change the default application for files of type \"%s\" to the selected application."
-msgstr "Alapértelmezett alkalmazás váltása \"%s\" típusú fájlokhoz a kijelölt alkalmazásra."
+msgid ""
+"Change the default application for files of type \"%s\" to the selected "
+"application."
+msgstr ""
+"Alapértelmezett alkalmazás váltása \"%s\" típusú fájlokhoz a kijelölt "
+"alkalmazásra."
 
 #: ../thunar/thunar-chooser-dialog.c:766
 #, c-format
@@ -674,48 +682,51 @@ msgstr "Biztosan eltávolítod?: \"%s\"?"
 
 #: ../thunar/thunar-chooser-dialog.c:772
 msgid ""
-"This will remove the application launcher that appears in the file context menu, but will not uninstall the application itself.\n"
+"This will remove the application launcher that appears in the file context "
+"menu, but will not uninstall the application itself.\n"
 "\n"
-"You can only remove application launchers that were created using the custom command box in the \"Open With\" dialog of the file manager."
+"You can only remove application launchers that were created using the custom "
+"command box in the \"Open With\" dialog of the file manager."
 msgstr ""
-"Ez törölni fogja az alkalmazás a helyi menüben megjelenő indítóját, de nem törli az alkalmazást magát.\n"
+"Ez törölni fogja az alkalmazás a helyi menüben megjelenő indítóját, de nem "
+"törli az alkalmazást magát.\n"
 "\n"
-"Csak a fájlkezelő \"Megnyitás ezzel\" párbeszéde egyéni parancs gombjával létrehozott indítók törölhetők így."
+"Csak a fájlkezelő \"Megnyitás ezzel\" párbeszéde egyéni parancs gombjával "
+"létrehozott indítók törölhetők így."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Válassz alkalmazást"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Minden fájl"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Futtatható fájlok"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl Szkriptek"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python Szkriptek"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby Szkriptek"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell Szkriptek"
 
@@ -804,14 +815,13 @@ msgstr "Oszlopok nyújtása, ha szükséges"
 #. the file_time is invalid
 #. reset page title
 #. tell the user that we're unable to determine the file info
-#: ../thunar/thunar-column-model.c:890
-#: ../thunar/thunar-list-model.c:727
+#: ../thunar/thunar-column-model.c:890 ../thunar/thunar-list-model.c:727
 #: ../thunar/thunar-list-model.c:756
-#: ../thunar/thunar-permissions-chooser.c:273
-#: ../thunar/thunar-util.c:131
+#: ../thunar/thunar-permissions-chooser.c:273 ../thunar/thunar-util.c:131
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -827,8 +837,7 @@ msgstr "Tömör nézet"
 msgid "C_reate"
 msgstr "Lét_rehoz"
 
-#: ../thunar/thunar-create-dialog.c:181
-#: ../thunar/thunar-standard-view.c:2207
+#: ../thunar/thunar-create-dialog.c:181 ../thunar/thunar-standard-view.c:2207
 msgid "Enter the new name:"
 msgstr "Új fájlnév megadása:"
 
@@ -860,8 +869,7 @@ msgstr "fordító-lista"
 
 #. display an error message to the user
 #. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:229
-#: ../thunar/thunar-renamer-dialog.c:981
+#: ../thunar/thunar-dialogs.c:229 ../thunar/thunar-renamer-dialog.c:981
 msgid "Failed to open the documentation browser"
 msgstr "Nem sikerült megnyitni a dokumentáció böngészőt"
 
@@ -899,8 +907,7 @@ msgstr "_Lánc ide"
 
 #. display an error to the user
 #. display an error message to the user
-#: ../thunar/thunar-dnd.c:192
-#: ../thunar/thunar-launcher.c:526
+#: ../thunar/thunar-dnd.c:192 ../thunar/thunar-launcher.c:526
 #, c-format
 msgid "Failed to execute file \"%s\""
 msgstr "Nem futtatható fájl: \"%s\""
@@ -940,8 +947,7 @@ msgstr "Tulajdonos"
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-enum-types.c:96
-#: ../thunar/thunar-properties-dialog.c:491
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:491
 msgid "Permissions"
 msgstr "Jogok"
 
@@ -979,10 +985,11 @@ msgstr "Előre"
 msgid "Go to the next visited folder"
 msgstr "Ugrás az ez utáni könyvtárra"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
-msgstr "Nem sikerült a pótikon betöltése innen: \"%s\" (%s). Ellenőrizd a telepítést!"
+msgstr ""
+"Nem sikerült a pótikon betöltése innen: \"%s\" (%s). Ellenőrizd a telepítést!"
 
 #: ../thunar/thunar-icon-view.c:191
 msgid "Icon based directory listing"
@@ -993,19 +1000,15 @@ msgid "Icon view"
 msgstr "Ikonnézet"
 
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:137
-#: ../thunar/thunar-launcher.c:783
+#: ../thunar/thunar-launcher.c:137 ../thunar/thunar-launcher.c:783
 #: ../thunar/thunar-location-buttons.c:1220
-#: ../thunar/thunar-shortcuts-view.c:796
-#: ../thunar/thunar-tree-view.c:1016
+#: ../thunar/thunar-shortcuts-view.c:796 ../thunar/thunar-tree-view.c:1016
 msgid "_Open"
 msgstr "_Megnyit"
 
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:138
-#: ../thunar/thunar-location-buttons.c:1233
-#: ../thunar/thunar-shortcuts-view.c:807
-#: ../thunar/thunar-tree-view.c:1028
+#: ../thunar/thunar-launcher.c:138 ../thunar/thunar-location-buttons.c:1233
+#: ../thunar/thunar-shortcuts-view.c:807 ../thunar/thunar-tree-view.c:1028
 msgid "Open in New Window"
 msgstr "Megnyitás új ablakban"
 
@@ -1013,13 +1016,11 @@ msgstr "Megnyitás új ablakban"
 msgid "Open the selected directory in a new window"
 msgstr "Kijelölt könyvtár megnyitása új ablakban"
 
-#: ../thunar/thunar-launcher.c:139
-#: ../thunar/thunar-launcher.c:141
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
 msgid "Open With Other _Application..."
 msgstr "Megnyitás más _alkalmazással..."
 
-#: ../thunar/thunar-launcher.c:139
-#: ../thunar/thunar-launcher.c:141
+#: ../thunar/thunar-launcher.c:139 ../thunar/thunar-launcher.c:141
 #: ../thunar/thunar-launcher.c:866
 msgid "Choose another application with which to open the selected file"
 msgstr "Másik alkalmazás választása a kijelölt fájl megnyitásához"
@@ -1089,8 +1090,7 @@ msgstr[0] "A kijelölt fájlok futtatása"
 msgid "_Open With \"%s\""
 msgstr "_Megnyitás ezzel: \"%s\""
 
-#: ../thunar/thunar-launcher.c:842
-#: ../thunar/thunar-launcher.c:931
+#: ../thunar/thunar-launcher.c:842 ../thunar/thunar-launcher.c:931
 #, c-format
 msgid "Use \"%s\" to open the selected file"
 msgid_plural "Use \"%s\" to open the selected files"
@@ -1130,8 +1130,7 @@ msgid "Send the selected file to \"%s\""
 msgid_plural "Send the selected files to \"%s\""
 msgstr[0] "Kijelölt fájlok küldése ide: \"%s\""
 
-#: ../thunar/thunar-list-model.c:775
-#: ../thunar/thunar-properties-dialog.c:760
+#: ../thunar/thunar-list-model.c:775 ../thunar/thunar-properties-dialog.c:760
 msgid "broken link"
 msgstr "törött lánc"
 
@@ -1174,8 +1173,7 @@ msgstr "\"%s\" (%s) %s"
 #. * where the trashed file/folder was located before it was moved to the trash), otherwise the
 #. * properties dialog width will be messed up.
 #.
-#: ../thunar/thunar-list-model.c:2256
-#: ../thunar/thunar-properties-dialog.c:340
+#: ../thunar/thunar-list-model.c:2256 ../thunar/thunar-properties-dialog.c:340
 msgid "Original Path:"
 msgstr "Eredeti útvonal:"
 
@@ -1225,8 +1223,7 @@ msgstr "Új mappa létrehozása itt: \"%s\""
 
 #. append the "Create Folder" menu action
 #: ../thunar/thunar-location-buttons.c:1251
-#: ../thunar/thunar-standard-view.c:316
-#: ../thunar/thunar-tree-view.c:1092
+#: ../thunar/thunar-standard-view.c:316 ../thunar/thunar-tree-view.c:1092
 msgid "Create _Folder..."
 msgstr "Mappa létrehozása..."
 
@@ -1237,8 +1234,11 @@ msgstr "Minden fájlt és mappát töröl a Kukából"
 #. add the "Paste Into Folder" action
 #: ../thunar/thunar-location-buttons.c:1280
 #, c-format
-msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
-msgstr "A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy másolása ide: \"%s\""
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgstr ""
+"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
+"másolása ide: \"%s\""
 
 #: ../thunar/thunar-location-buttons.c:1281
 #: ../thunar/thunar-standard-view.c:322
@@ -1257,14 +1257,12 @@ msgstr "Tulajdonságok"
 
 #. ask the user to enter a name for the new folder
 #: ../thunar/thunar-location-buttons.c:1366
-#: ../thunar/thunar-standard-view.c:1785
-#: ../thunar/thunar-tree-view.c:1448
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "New Folder"
 msgstr "Új mappa"
 
 #: ../thunar/thunar-location-buttons.c:1366
-#: ../thunar/thunar-standard-view.c:1785
-#: ../thunar/thunar-tree-view.c:1448
+#: ../thunar/thunar-standard-view.c:1785 ../thunar/thunar-tree-view.c:1448
 msgid "Create New Folder"
 msgstr "Új mappa létrehozása"
 
@@ -1276,8 +1274,7 @@ msgstr "Hely megnyitása"
 msgid "_Location:"
 msgstr "_Hely:"
 
-#: ../thunar/thunar-location-entry.c:423
-#: ../thunar/thunar-window.c:1210
+#: ../thunar/thunar-location-entry.c:423 ../thunar/thunar-window.c:1210
 #, c-format
 msgid "Failed to launch \"%s\""
 msgstr "Nem futtatható: \"%s\""
@@ -1390,8 +1387,13 @@ msgid "Do _not ask me again"
 msgstr "_Ne kérdezd ismét"
 
 #: ../thunar/thunar-permissions-chooser.c:626
-msgid "If you select this option your choice will be remembered and you won't be asked again. You can use the preferences dialog to alter your choice afterwards."
-msgstr "Ha ezt a lehetőséget választod, megjegyzem azt, és nemkérdem többé. Később a beállítások között módosíthatod."
+msgid ""
+"If you select this option your choice will be remembered and you won't be "
+"asked again. You can use the preferences dialog to alter your choice "
+"afterwards."
+msgstr ""
+"Ha ezt a lehetőséget választod, megjegyzem azt, és nemkérdem többé. Később a "
+"beállítások között módosíthatod."
 
 #. display an error to the user
 #: ../thunar/thunar-permissions-chooser.c:706
@@ -1417,8 +1419,13 @@ msgid "Correct folder permissions"
 msgstr "Könyvtár jogok javítása"
 
 #: ../thunar/thunar-permissions-chooser.c:1076
-msgid "The folder permissions will be reset to a consistent state. Only users allowed to read the contents of this folder will be allowed to enter the folder afterwards."
-msgstr "A könyvtár jogait ismét összefüggőre állítom. Csak e könyvtár tartalmát olvasni jogosult felhasználók léphetnek majd bele."
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+"A könyvtár jogait ismét összefüggőre állítom. Csak e könyvtár tartalmát "
+"olvasni jogosult felhasználók léphetnek majd bele."
 
 #: ../thunar/thunar-preferences-dialog.c:222
 msgid "File Manager Preferences"
@@ -1462,14 +1469,17 @@ msgstr "Előbb a mappák"
 
 #: ../thunar/thunar-preferences-dialog.c:288
 msgid "Select this option to list folders before files when you sort a folder."
-msgstr "Ha ezt választod, egy mappa rendezésekor a mappák a fájlok elé kerülnek."
+msgstr ""
+"Ha ezt választod, egy mappa rendezésekor a mappák a fájlok elé kerülnek."
 
 #: ../thunar/thunar-preferences-dialog.c:292
 msgid "_Show thumbnails"
 msgstr "Előképek mutatá_sa"
 
 #: ../thunar/thunar-preferences-dialog.c:294
-msgid "Select this option to display previewable files within a folder as automatically generated thumbnail icons."
+msgid ""
+"Select this option to display previewable files within a folder as "
+"automatically generated thumbnail icons."
 msgstr "E lehetőség az előnézhető fájlokat előképi ikonokként mutatja."
 
 #: ../thunar/thunar-preferences-dialog.c:315
@@ -1477,7 +1487,9 @@ msgid "_Text beside icons"
 msgstr "Szöveg az ikonok mellett"
 
 #: ../thunar/thunar-preferences-dialog.c:317
-msgid "Select this option to place the icon captions for items beside the icon rather than below the icon."
+msgid ""
+"Select this option to place the icon captions for items beside the icon "
+"rather than below the icon."
 msgstr "A feliratok az ikon mellé kerüljenek, ne alá."
 
 #.
@@ -1535,8 +1547,12 @@ msgid "Show Icon _Emblems"
 msgstr "Ikon j_elképek mutatása"
 
 #: ../thunar/thunar-preferences-dialog.c:378
-msgid "Select this option to display icon emblems in the shortcuts pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "E lehetőség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet megjeleníti a könyvjelző panelon."
+msgid ""
+"Select this option to display icon emblems in the shortcuts pane for all "
+"folders for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"E lehetőség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet "
+"megjeleníti a könyvjelző panelon."
 
 #: ../thunar/thunar-preferences-dialog.c:387
 msgid "Tree Pane"
@@ -1551,8 +1567,12 @@ msgid "Show Icon E_mblems"
 msgstr "Ikon jelképek _mutatása"
 
 #: ../thunar/thunar-preferences-dialog.c:429
-msgid "Select this option to display icon emblems in the tree pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "E lehetőség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet megjeleníti a fa panelon."
+msgid ""
+"Select this option to display icon emblems in the tree pane for all folders "
+"for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"E lehetőség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet "
+"megjeleníti a fa panelon."
 
 #.
 #. Behavior
@@ -1578,8 +1598,17 @@ msgstr ""
 "mikor ráviszed az egeret:"
 
 #: ../thunar/thunar-preferences-dialog.c:492
-msgid "When single-click activation is enabled, pausing the mouse pointer over an item will automatically select that item after the chosen delay. You can disable this behavior by moving the slider to the left-most position. This behavior may be useful when single clicks activate items, and you want only to select the item without activating it."
-msgstr "Ha az egy-kattintós indítás be van kapcsolva, az egér megállítása egy elem felett automatikusan kiválasztja azt egy megadott késleltetés után. A viselkedés kikapcsolható a csúszka balra húzásával. Ez hasznos egy-kattintós módban, ha csak kijelölni akarod az elemet indítása nélkül."
+msgid ""
+"When single-click activation is enabled, pausing the mouse pointer over an "
+"item will automatically select that item after the chosen delay. You can "
+"disable this behavior by moving the slider to the left-most position. This "
+"behavior may be useful when single clicks activate items, and you want only "
+"to select the item without activating it."
+msgstr ""
+"Ha az egy-kattintós indítás be van kapcsolva, az egér megállítása egy elem "
+"felett automatikusan kiválasztja azt egy megadott késleltetés után. A "
+"viselkedés kikapcsolható a csúszka balra húzásával. Ez hasznos egy-kattintós "
+"módban, ha csak kijelölni akarod az elemet indítása nélkül."
 
 #: ../thunar/thunar-preferences-dialog.c:516
 msgid "Disabled"
@@ -1721,18 +1750,15 @@ msgstr "%s - Tulajdonságok"
 msgid "Failed to rename \"%s\""
 msgstr "Nem átnevezhető: \"%s\""
 
-#: ../thunar/thunar-renamer-dialog.c:172
-#: ../thunar/thunar-window.c:253
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:253
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../thunar/thunar-renamer-dialog.c:173
-#: ../thunar/thunar-window.c:255
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:255
 msgid "_Send To"
 msgstr "Küldé_s ide"
 
-#: ../thunar/thunar-renamer-dialog.c:174
-#: ../thunar/thunar-standard-view.c:314
+#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-standard-view.c:314
 msgid "File Context Menu"
 msgstr "Helyi fájl menü"
 
@@ -1752,8 +1778,7 @@ msgstr "Ürít"
 msgid "Clear the file list below"
 msgstr "Kiüríti az alábbi fájl listát"
 
-#: ../thunar/thunar-renamer-dialog.c:178
-#: ../thunar/thunar-window.c:274
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:274
 msgid "_About"
 msgstr "_Névjegy"
 
@@ -1761,13 +1786,11 @@ msgstr "_Névjegy"
 msgid "Display information about Thunar Bulk Rename"
 msgstr "Információkat nyújt a Thunar csoportos átnevezésről"
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:317
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "_Properties..."
 msgstr "Tulajdonságok..."
 
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-standard-view.c:317
+#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:317
 msgid "View the properties of the selected file"
 msgstr "A kijelölt fájl tulajdonságainak megtekintése"
 
@@ -1783,7 +1806,8 @@ msgid "_Rename Files"
 msgstr "Fájlok átnevezése"
 
 #: ../thunar/thunar-renamer-dialog.c:371
-msgid "Click here to actually rename the files listed above to their new names."
+msgid ""
+"Click here to actually rename the files listed above to their new names."
 msgstr "Kattints ide a fent listázott fájlok átnevezéséhez most az új nevükre."
 
 #: ../thunar/thunar-renamer-dialog.c:443
@@ -1814,7 +1838,6 @@ msgid "Audio Files"
 msgstr "Hang fájlok"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Képfájlok"
 
@@ -1857,8 +1880,13 @@ msgid "Failed to rename \"%s\" to \"%s\"."
 msgstr "Nem sikerült átnevezni \"%s\"-t erre: \"%s\"."
 
 #: ../thunar/thunar-renamer-progress.c:221
-msgid "You can either choose to skip this file and continue to rename the remaining files, or revert the previously renamed files to their previous names, or cancel the operation without reverting previous changes."
-msgstr "Kihagyhatod, visszavonhatod az átnevezéseket vagy dönthetsz úgy, hogy ezután mégsem folytatod a műveletet."
+msgid ""
+"You can either choose to skip this file and continue to rename the remaining "
+"files, or revert the previously renamed files to their previous names, or "
+"cancel the operation without reverting previous changes."
+msgstr ""
+"Kihagyhatod, visszavonhatod az átnevezéseket vagy dönthetsz úgy, hogy ezután "
+"mégsem folytatod a műveletet."
 
 #: ../thunar/thunar-renamer-progress.c:226
 msgid "_Revert Changes"
@@ -1870,7 +1898,8 @@ msgid "_Skip This File"
 msgstr "E fájl kihagyása"
 
 #: ../thunar/thunar-renamer-progress.c:233
-msgid "Do you want to skip this file and continue to rename the remaining files?"
+msgid ""
+"Do you want to skip this file and continue to rename the remaining files?"
 msgstr "Kihagyod a fájlt és folytatod az átnevezést?"
 
 #: ../thunar/thunar-shortcuts-pane.c:413
@@ -1884,20 +1913,17 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
 msgstr[0] "Kijelölt mappák hozzáadása a könyvjelzők panelhoz"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:821
-#: ../thunar/thunar-tree-view.c:1042
+#: ../thunar/thunar-shortcuts-view.c:821 ../thunar/thunar-tree-view.c:1042
 msgid "_Mount Volume"
 msgstr "Kötet felcsatolása"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:831
-#: ../thunar/thunar-tree-view.c:1052
+#: ../thunar/thunar-shortcuts-view.c:831 ../thunar/thunar-tree-view.c:1052
 msgid "E_ject Volume"
 msgstr "Lemez kiadása"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:840
-#: ../thunar/thunar-tree-view.c:1061
+#: ../thunar/thunar-shortcuts-view.c:840 ../thunar/thunar-tree-view.c:1061
 msgid "_Unmount Volume"
 msgstr "Kötet lecsatolása"
 
@@ -1922,15 +1948,13 @@ msgid "Failed to add new shortcut"
 msgstr "A könyvjelző hozzáadása sikertelen"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1293
-#: ../thunar/thunar-tree-view.c:1556
+#: ../thunar/thunar-shortcuts-view.c:1293 ../thunar/thunar-tree-view.c:1556
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Nem lehet kiadni: \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1339
-#: ../thunar/thunar-tree-view.c:950
+#: ../thunar/thunar-shortcuts-view.c:1339 ../thunar/thunar-tree-view.c:950
 #: ../thunar/thunar-tree-view.c:1607
 #, c-format
 msgid "Failed to mount \"%s\""
@@ -1938,8 +1962,7 @@ msgstr "Nem csatolható: \"%s\""
 
 #. display an error dialog to inform the user
 #. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1383
-#: ../thunar/thunar-tree-view.c:1747
+#: ../thunar/thunar-shortcuts-view.c:1383 ../thunar/thunar-tree-view.c:1747
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Nem leválasztható: \"%s\""
@@ -1978,14 +2001,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Üres mappa létrehozása e mappán belül"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:318
-#: ../thunar/thunar-tree-view.c:1113
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1113
 msgid "Cu_t"
 msgstr "Vágás"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:319
-#: ../thunar/thunar-tree-view.c:1125
+#: ../thunar/thunar-standard-view.c:319 ../thunar/thunar-tree-view.c:1125
 msgid "_Copy"
 msgstr "Másolás"
 
@@ -1995,17 +2016,22 @@ msgstr "Beillesztés"
 
 #: ../thunar/thunar-standard-view.c:320
 msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy másolása"
+msgstr ""
+"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
+"másolása"
 
 #. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:321
-#: ../thunar/thunar-tree-view.c:1160
+#: ../thunar/thunar-standard-view.c:321 ../thunar/thunar-tree-view.c:1160
 msgid "_Delete"
 msgstr "Töröl"
 
 #: ../thunar/thunar-standard-view.c:322
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy másolása a kijelölt mappába"
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
+"másolása a kijelölt mappába"
 
 #: ../thunar/thunar-standard-view.c:323
 msgid "Select _all Files"
@@ -2027,8 +2053,7 @@ msgstr "Egy adott mintára illő valamennyi fájl kiválasztása"
 msgid "Du_plicate"
 msgstr "Kettőzés"
 
-#: ../thunar/thunar-standard-view.c:326
-#: ../thunar/thunar-standard-view.c:3371
+#: ../thunar/thunar-standard-view.c:326 ../thunar/thunar-standard-view.c:3371
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Lánc _készítése"
@@ -2106,7 +2131,8 @@ msgstr "Nem megnyitható könyvtár: \"%s\""
 #: ../thunar/thunar-standard-view.c:3331
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
-msgstr[0] "Előkészíti a kijelölt fájlt a Beillesztés paranccsal való mozgatáshoz"
+msgstr[0] ""
+"Előkészíti a kijelölt fájlt a Beillesztés paranccsal való mozgatáshoz"
 
 #: ../thunar/thunar-standard-view.c:3339
 msgid "Prepare the selected file to be copied with a Paste command"
@@ -2410,13 +2436,18 @@ msgstr "E mappa minden fájlja megjelenik a \"Dokumentum létrehozása\" menübe
 
 #: ../thunar/thunar-window.c:1756
 msgid ""
-"If you frequently create certain kinds of documents, make a copy of one and put it in this folder. Thunar will add an entry for this document in the \"Create Document\" menu.\n"
+"If you frequently create certain kinds of documents, make a copy of one and "
+"put it in this folder. Thunar will add an entry for this document in the "
+"\"Create Document\" menu.\n"
 "\n"
-"You can then select the entry from the \"Create Document\" menu and a copy of the document will be created in the directory you are viewing."
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
 msgstr ""
-"Ha sűrűn hozol létre egy bizonyos fajta dokumentumot, egy másolatát dobd ide. A Thunar így berakja a \"Dokumentum létrehozása\" menübe.\n"
+"Ha sűrűn hozol létre egy bizonyos fajta dokumentumot, egy másolatát dobd "
+"ide. A Thunar így berakja a \"Dokumentum létrehozása\" menübe.\n"
 "\n"
-"Ezután a \"Dokumentum létrehozása\" menüben létre tudsz hozni egy ilyen dokumentumot a választott könyvtárban."
+"Ezután a \"Dokumentum létrehozása\" menüben létre tudsz hozni egy ilyen "
+"dokumentumot a választott könyvtárban."
 
 #: ../thunar/thunar-window.c:1768
 msgid "Do _not display this message again"
@@ -2475,8 +2506,11 @@ msgid "Description:"
 msgstr "Leírás:"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:165
-msgid "The generic name of the entry, for example \"Web Browser\" in case of Firefox."
-msgstr "A bejegyzés általános neve, például \"Webböngésző\" mondjuk a Firefox-hoz"
+msgid ""
+"The generic name of the entry, for example \"Web Browser\" in case of "
+"Firefox."
+msgstr ""
+"A bejegyzés általános neve, például \"Webböngésző\" mondjuk a Firefox-hoz"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
 msgid "Command:"
@@ -2499,8 +2533,12 @@ msgid "Comment:"
 msgstr "Megjegyzés:"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:232
-msgid "Tooltip for the entry, for example \"View sites on the Internet\" in case of Firefox. Should not be redundant with the name or the description."
-msgstr "Eszköztipp az elemhez, például: \"Webböngészés\" valamely böngészőhöz, mondjuk a Firefox-hoz. Ne legyen azonos a névvel vagy leírással."
+msgid ""
+"Tooltip for the entry, for example \"View sites on the Internet\" in case of "
+"Firefox. Should not be redundant with the name or the description."
+msgstr ""
+"Eszköztipp az elemhez, például: \"Webböngészés\" valamely böngészőhöz, "
+"mondjuk a Firefox-hoz. Ne legyen azonos a névvel vagy leírással."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
 msgid "Options:"
@@ -2511,8 +2549,13 @@ msgid "Use _startup notification"
 msgstr "Indítási emlékeztető használata"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:259
-msgid "Select this option to enable startup notification when the command is run from the file manager or the menu. Not every application supports startup notification."
-msgstr "E lehetőség nyújtja az indítási emlékeztetőt a parancs futtatásakor a fájlkezelőből vagy menüből. Ezt nem minden alkalmazás támogatja."
+msgid ""
+"Select this option to enable startup notification when the command is run "
+"from the file manager or the menu. Not every application supports startup "
+"notification."
+msgstr ""
+"E lehetőség nyújtja az indítási emlékeztetőt a parancs futtatásakor a "
+"fájlkezelőből vagy menüből. Ezt nem minden alkalmazás támogatja."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
 msgid "Run in _terminal"
@@ -2726,15 +2769,21 @@ msgid "Regular _Expression"
 msgstr "Szabályos kifejezés"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:231
-msgid "If you enable this option, the pattern will be treated as a regular expression and matched using the Perl-compatible regular expressions (PCRE). Check the documentation for details about the regular expression syntax."
-msgstr "E lehetőséggel a Thunar a mintát Perl-stílusú szabályos kifejezésként (l. PCRE) kezeli. L. a dokumentációt a szabályos kifejezések nyelvtanához."
+msgid ""
+"If you enable this option, the pattern will be treated as a regular "
+"expression and matched using the Perl-compatible regular expressions (PCRE). "
+"Check the documentation for details about the regular expression syntax."
+msgstr ""
+"E lehetőséggel a Thunar a mintát Perl-stílusú szabályos kifejezésként (l. "
+"PCRE) kezeli. L. a dokumentációt a szabályos kifejezések nyelvtanához."
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:238
 msgid "Replace _With:"
 msgstr "Csere erre:"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:246
-msgid "Enter the text that should be used as replacement for the pattern above."
+msgid ""
+"Enter the text that should be used as replacement for the pattern above."
 msgstr "Add meg a szöveget, melyre a fenti mintát cseréljük."
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:258
@@ -2742,8 +2791,12 @@ msgid "C_ase Sensitive Search"
 msgstr "kis/N_agybetűs Keresés"
 
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:260
-msgid "If you enable this option, the pattern will be searched in a case-sensitive manner. The default is to use a case-insensitive search."
-msgstr "E lehetőség a mintát kis/Nagybetű-érzékenyen keresi. Az alapértelmezett a kis/Nagybetű-érzéketlen keresés."
+msgid ""
+"If you enable this option, the pattern will be searched in a case-sensitive "
+"manner. The default is to use a case-insensitive search."
+msgstr ""
+"E lehetőség a mintát kis/Nagybetű-érzékenyen keresi. Az alapértelmezett a "
+"kis/Nagybetű-érzéketlen keresés."
 
 #. setup a tooltip with the error message
 #: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:620
@@ -2770,8 +2823,13 @@ msgid "Send com_pressed"
 msgstr "Tömörítve küld"
 
 #: ../plugins/thunar-sendto-email/main.c:181
-msgid "When sending a file via email, you can either choose to send the file directly, as is, or compress the file before attaching it to an email. It is highly recommended to compress large files before sending them."
-msgstr "Fájl email-ben küldésekor, küldheted közvetlenül vagy tömörítve. A nagy fájlokat nagyon ajánlott tömöríteni küldés előtt."
+msgid ""
+"When sending a file via email, you can either choose to send the file "
+"directly, as is, or compress the file before attaching it to an email. It is "
+"highly recommended to compress large files before sending them."
+msgstr ""
+"Fájl email-ben küldésekor, küldheted közvetlenül vagy tömörítve. A nagy "
+"fájlokat nagyon ajánlott tömöríteni küldés előtt."
 
 #: ../plugins/thunar-sendto-email/main.c:192
 #, c-format
@@ -2784,8 +2842,15 @@ msgid "Send as _archive"
 msgstr "_Archívumként küld"
 
 #: ../plugins/thunar-sendto-email/main.c:200
-msgid "When sending multiple files via email, you can either choose to send the files directly, attaching multiple files to an email, or send all files compressed into a single archive file and attach the archive. It is highly recommended to send multiple large files as archive."
-msgstr "Több fájl küldésekor email-ben, küldheted azokat közvetlenül, egyesével csatolva, vagy egy archívumba tömörítve. Ha nagyobb fájlok is vannak, nagyon ajánlott, hogy tömörített archívumot küldjünk."
+msgid ""
+"When sending multiple files via email, you can either choose to send the "
+"files directly, attaching multiple files to an email, or send all files "
+"compressed into a single archive file and attach the archive. It is highly "
+"recommended to send multiple large files as archive."
+msgstr ""
+"Több fájl küldésekor email-ben, küldheted azokat közvetlenül, egyesével "
+"csatolva, vagy egy archívumba tömörítve. Ha nagyobb fájlok is vannak, nagyon "
+"ajánlott, hogy tömörített archívumot küldjünk."
 
 #. allocate the progress dialog
 #. setup the label
@@ -2898,53 +2963,71 @@ msgstr "A művelet mentése meghiúsult."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Alap"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Név:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "A művelet e néven jelenik meg a helyi menüben."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "Leírás:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
-msgid "The description of the action that will be displayed as tooltip in the statusbar when selecting the item from the context menu."
-msgstr "A művelet leírása eszköztippként megjelenik az állapotsorban az elem kijelölésekor a helyi menüből."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
+msgid ""
+"The description of the action that will be displayed as tooltip in the "
+"statusbar when selecting the item from the context menu."
+msgstr ""
+"A művelet leírása eszköztippként megjelenik az állapotsorban az elem "
+"kijelölésekor a helyi menüből."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "Paran_cs:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
-msgid "The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, %D, %N) are used, the action will be applicable even if more than one item is selected. Else the action will only be applicable if exactly one item is selected."
-msgstr "A műveletet végrehajtó parancs (a szükséges paraméterekkel). L. a parancs paramétereket alább a támogatott paraméter változókhoz, melyeket a parancs futtatásakor behelyettesítem. Nagybetűkre (pl.: %F, %D, %N) minden kijelölt elemre lefuttatom, amúgy csak 1 kijelölt elem esetén hajtom végre."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
+msgid ""
+"The command (including the necessary parameters) to perform the action. See "
+"the command parameter legend below for a list of supported parameter "
+"variables, which will be substituted when launching the command. When upper-"
+"case letters (e.g. %F, %D, %N) are used, the action will be applicable even "
+"if more than one item is selected. Else the action will only be applicable "
+"if exactly one item is selected."
+msgstr ""
+"A műveletet végrehajtó parancs (a szükséges paraméterekkel). L. a parancs "
+"paramétereket alább a támogatott paraméter változókhoz, melyeket a parancs "
+"futtatásakor behelyettesítem. Nagybetűkre (pl.: %F, %D, %N) minden kijelölt "
+"elemre lefuttatom, amúgy csak 1 kijelölt elem esetén hajtom végre."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "Böngészd a fájlrendszert egy alkalmazás kijelöléséhez e művelethez."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "Ikon:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Nincs ikon"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
-msgid "Click this button to select an icon file that will be displayed in the context menu in addition to the action name chosen above."
-msgstr "Kattints ide egy ikonfájl kijelöléséhez, mely megjelenik a helyi menüben a fenti műveletnévhez"
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
+msgid ""
+"Click this button to select an icon file that will be displayed in the "
+"context menu in addition to the action name chosen above."
+msgstr ""
+"Kattints ide egy ikonfájl kijelöléséhez, mely megjelenik a helyi menüben a "
+"fenti műveletnévhez"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -2952,73 +3035,80 @@ msgstr ""
 "Az alábbi parancs paraméterek lesznek\n"
 "a művelethez rendelve:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "az 1. kijelölt fájl ösvénye"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "a kijelölt fájlok ösvényei"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "a %f-ben átadott fájlt tartalmazó könyvtár"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "a %F-ben átadott fájlt tartalmazó könyvtárak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "az 1. fájlnév (ösvény nélkül)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "a kijelölt fájnevek (ösvények nélkül)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Megjelenési feltételek"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Fájl minta:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
-msgid "Enter a list of patterns that will be used to determine whether this action should be displayed for a selected file. If you specify more than one pattern here, the list items must be separated with semicolons (e.g. *.txt;*.doc)."
-msgstr "Adj meg egy vagy több végződést, amelyre megjelenjen e művelet. Amennyiben többet is megadsz, ezeket pontosvesszővel kell elválasztani (pl.: *.txt; *.odt, *.docx; *.rtf; *.doc)."
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
+msgid ""
+"Enter a list of patterns that will be used to determine whether this action "
+"should be displayed for a selected file. If you specify more than one "
+"pattern here, the list items must be separated with semicolons (e.g. *.txt;*."
+"doc)."
+msgstr ""
+"Adj meg egy vagy több végződést, amelyre megjelenjen e művelet. Amennyiben "
+"többet is megadsz, ezeket pontosvesszővel kell elválasztani (pl.: *.txt; *."
+"odt, *.docx; *.rtf; *.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "E kijelöléseknél jelenik meg:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "Könyvtárak"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "Hang fájlok"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Kép fájlok"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Szöveg fájlok"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Mozgóképek"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "Egyéb fájlok"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3040,8 +3130,10 @@ msgstr ""
 "kell a fájl vagy mappa nevére. Megadhatod, hogy a\n"
 "művelet csak bizonyos fajta fájlokra jelenjen meg."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Válassz ikont"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
@@ -3071,7 +3163,8 @@ msgid "Configure c_ustom actions..."
 msgstr "Egyéni műveletek beállítása..."
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:189
-msgid "Setup custom actions that will appear in the file managers context menus"
+msgid ""
+"Setup custom actions that will appear in the file managers context menus"
 msgstr "Az egyéni műveletek megjelennek a fájlkezelő helyi menüiben"
 
 #: ../plugins/thunar-uca/thunar-uca-provider.c:406
@@ -3113,6 +3206,7 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
 
 #~ msgid "Links from or to resources in the trash are not supported"
 #~ msgstr "A kuka és más erőforrások közti láncok nem támogatottak"
+
 #~ msgid "Delete the selected file permanently"
 #~ msgid_plural "Delete the selected files permanently"
 #~ msgstr[0] "Kijelölt fájl végleges törlése"
@@ -3120,12 +3214,15 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
 #, fuzzy
 #~ msgid "Failed to change permisions of \"%s\""
 #~ msgstr "\"%s\" jogainak cseréje sikertelen: %s"
+
 #~ msgid "Failed to determine file info of \"%s\": %s"
 #~ msgstr "\"%s\" fájlinfó meghatározása sikertelen: %s"
+
 #~ msgid ""
 #~ "The file \"%s\" already exists. Do you want to replace it with an empty "
 #~ "file?"
 #~ msgstr "\"%s\" fájl már létezik. Üres fájllal cseréljük?"
+
 #~ msgid ""
 #~ "Failed to remove \"%s\".\n"
 #~ "\n"
@@ -3134,6 +3231,7 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
 #~ "Nem törölhető: \"%s\".\n"
 #~ "\n"
 #~ "Átugrod?"
+
 #~ msgid ""
 #~ "Failed to create empty file \"%s\".\n"
 #~ "\n"
@@ -3142,22 +3240,30 @@ msgstr "Kijelölt mappák megnyitása a Thunar-ban"
 #~ "Nem hozható létre az üres fájl: %s.\n"
 #~ "\n"
 #~ "Átugrod?"
+
 #~ msgid "Failed to stat file \"%s\": %s"
 #~ msgstr "\"%s\" elérése sikertelen: %s"
+
 #~ msgid "Failed to create directory \"%s\": %s"
 #~ msgstr "Az alábbi könyvtár létrehozása nem sikerült: \"%s\": %s"
+
 #~ msgid "Deleting directories..."
 #~ msgstr "Könyvtárak törlése..."
+
 #~ msgid "Failed to remove directory \"%s\": %s"
 #~ msgstr "Nem törölhető e könyvtár: \"%s\": %s"
+
 #~ msgid "Cannot transfer the root directory"
 #~ msgstr "A gyökér könyvtár nem mozgatható"
+
 #~ msgid "Operation canceled"
 #~ msgstr "Művelet törölve"
+
 #~ msgid "Failed to read link target from \"%s\""
 #~ msgstr "A lánc céljának olvasása sikertelen: \"%s\""
+
 #~ msgid "Failed to change mode of \"%s\""
 #~ msgstr "Nem módosíthatók a jogok: \"%s\""
+
 #~ msgid "Failed to copy special file \"%s\""
 #~ msgstr "Nem sikerült e speciális fájl másolása: \"%s\""
-
diff --git a/po/it.po b/po/it.po
index 9bd05d2a994e183e855c7b3a8c1913fe52732f0b..38f3c6241e700294dac70a7334956c61f962bdd8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-07 14:56+0100\n"
 "Last-Translator: Roberto Pariset <robdebian@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -717,39 +717,38 @@ msgstr ""
 "Comando Personalizzato nella finestra \"Apri con\" del file manager."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Selezionare un'applicazione"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Tutti i file"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "File eseguibili"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Script Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Script Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Script Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Script Shell"
 
@@ -845,6 +844,7 @@ msgstr "_Espandi automaticamente le colonne quando necessario"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -1009,7 +1009,7 @@ msgstr "Avanti"
 msgid "Go to the next visited folder"
 msgstr "Vai alla directory visitata successivamente"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1900,7 +1900,6 @@ msgid "Audio Files"
 msgstr "File audio"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "File di Immagine"
 
@@ -3067,23 +3066,23 @@ msgstr "Impossibile salvare le azioni su disco."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Basilare"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Il nome dell'azione che verrà visualizzato nel menu contestuale."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Descrizione:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3091,11 +3090,11 @@ msgstr ""
 "La descrizione dell'azione che verrà mostrata come suggerimento nella barra "
 "di stato quando viene selezionato l'elemento dal menu contestuale."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Comando:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3112,23 +3111,23 @@ msgstr ""
 "L'azione sarà altrimenti applicabile solo nel caso in cui un solo elemento "
 "sia selezionato."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Esplora il file system per selezionare un'applicazione da usare per questa "
 "azione."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Icona:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Nessuna icona"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3136,7 +3135,7 @@ msgstr ""
 "Cliccare su questo bottone per selezionare un'icona che sarà mostrata nel "
 "menu contestuale insieme con il nome dell'azione scelto sopra."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3144,41 +3143,41 @@ msgstr ""
 "I seguenti parametri saranno sostituiti\n"
 "quando verrà lanciata l'azione:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "la path del primo file selezionato"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "le path di tutti i file selezionati"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "directory contenenti il file passato in %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "directory contenenti i file passati in %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "il nome del primo file selezionato (senza path)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "i nomi dei file selezionati (senza path)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Condizioni di visibilità"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "Pattern del _file:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3190,35 +3189,35 @@ msgstr ""
 "pattern, gli elementi della lista devono essere separati da un punto e "
 "virgola (e.g. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Appare se la selezione contiene:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Directory"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "File _audio"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Immagini"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "File di _testo"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "File _video"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "Alt_ri file"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3242,8 +3241,10 @@ msgstr ""
 "Inoltre, è possibile specificare che l'azione\n"
 "sia visibile solamente per certi tipi di file."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Seleziona un'icona"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/ja.po b/po/ja.po
index 83b00e981ce55f69eedb31b69f8b1c5ecfb7e936..052a69d71af60039240a9ad8be4b91c5b92a8b7d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-06-13 04:11+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -727,39 +727,38 @@ msgstr ""
 "ボックスを利用して作成されたアプリケーション・ランチャーのみが削除されます。"
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "アプリケーションを選択してください"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "全てのファイル"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "実行可能ファイル"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perlスクリプト"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Pythonスクリプト"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Rubyスクリプト"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "シェルスクリプト"
 
@@ -852,6 +851,7 @@ msgstr "必要に応じて表示欄を自動的に拡げる(_E)"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "不明"
 
@@ -1017,7 +1017,7 @@ msgstr "進む"
 msgid "Go to the next visited folder"
 msgstr "次のフォルダに移動します。"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1897,7 +1897,6 @@ msgid "Audio Files"
 msgstr "音楽ファイル"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "画像ファイル"
 
@@ -3046,23 +3045,23 @@ msgstr "アクションを保存するのに失敗しました。"
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "基本"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "右クリックメニューに表示されるアクションの名前です。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "説明(_D):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3070,11 +3069,11 @@ msgstr ""
 "このアクションの説明は、右クリックメニューからアイテムを選択する時に、ツール"
 "チップとしてステータスバーに表示されます。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "コマンド(_C):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3089,23 +3088,23 @@ msgstr ""
 "(例えば %F, %D, %N) が使用される場合、アクションは複数のアイテムが選択されて"
 "も適用可能になります。小文字の場合はただ一つのアイテムにのみ適用されます。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "このアクションに使用するアプリケーションを選択するためにファイルシステムを参"
 "照します。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "アイコン(_I):"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "アイコンはありません"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3113,7 +3112,7 @@ msgstr ""
 "このボタンをクリックすると、アイコンを選択できます。このアイコンは右クリック"
 "メニューで、上のアクション名の横に表示されます。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3121,41 +3120,41 @@ msgstr ""
 "以下のコマンドパラメーターには、アクション\n"
 "実行時に実際のファイル・フォルダ名が入ります:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "選択した最初のファイルへのパス"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "選択した全てのファイルへのパス"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "%f に渡されるファイルを含むフォルダ"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "%F に渡される複数のファイルを含む複数のフォルダ"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "選択した最初のファイル名 (パスを含まない)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "選択した複数のファイル名 (複数のパスを含まない)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "登場する条件"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "ファイルのパターン(_F):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3166,35 +3165,35 @@ msgstr ""
 "で表示すべきかどうかを決めるために使用されます。一つ以上のパターンを指定する"
 "なら (例えば「*.txt;*.doc」のように) セミコロンで区切る必要があります。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "以下を選択した場合に登場:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "フォルダ(_D)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "音楽ファイル(_A)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "画像ファイル(_I)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "テキストファイル(_T)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "動画ファイル(_V)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "その他のファイル(_O)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3221,8 +3220,10 @@ msgstr ""
 "さらに言うと、アクションはある特定のタイプのファイルで\n"
 "のみ現れるようにする方が良いでしょう。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "アイコンを選択してください"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/lt.po b/po/lt.po
index 739df609549f6ae36a98134f946accb187cb3ee4..bb2d762a82278e299f3f7142dc31411fecc67cad 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-05-26 11:16+0300\n"
 "Last-Translator: mantas <mantaz@users.sourceforge.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -686,39 +686,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr ""
 
@@ -808,6 +807,7 @@ msgstr ""
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr ""
 
@@ -971,7 +971,7 @@ msgstr ""
 msgid "Go to the next visited folder"
 msgstr ""
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1833,7 +1833,6 @@ msgid "Audio Files"
 msgstr ""
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr ""
 
@@ -2954,33 +2953,33 @@ msgstr ""
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -2990,67 +2989,67 @@ msgid ""
 "if exactly one item is selected."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr ""
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3058,35 +3057,35 @@ msgid ""
 "doc)."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3100,8 +3099,10 @@ msgid ""
 "files."
 msgstr ""
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, c-format
+msgid "Select an Icon for \"%s\""
 msgstr ""
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/nl.po b/po/nl.po
index 0bad24ea84302be10090e34983ee056ef8157638..dda07562e700bdb25ac268fa3ac8c462f616d7cd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-03-25 18:02+0100\n"
 "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -740,39 +740,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Selecteer een programma"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Alle Bestanden"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Uitvoerbare bestanden"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl scripts"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python Scripts"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby Scripts"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell Scripts"
 
@@ -868,6 +867,7 @@ msgstr "Kolommen automatisch _uitklappen wanneer nodig"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -1045,7 +1045,7 @@ msgstr "Volgende"
 msgid "Go to the next visited folder"
 msgstr "Ga naar de volgende map"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, fuzzy, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1958,7 +1958,6 @@ msgid "Audio Files"
 msgstr "_Geluidsbestanden"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Afbeeldingen"
 
@@ -3165,23 +3164,23 @@ msgstr "Fout bij het opslaan van de acties."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Basis"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Naam van de actie die in het contextmenu zal worden weergegeven."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Beschrijving:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3189,11 +3188,11 @@ msgstr ""
 "Beschrijving van de actie, zal worden weergegeven als beschrijving in de "
 "statusbar wanneer u het item selecteerd vanuit het contextmenu."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Commando:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3209,23 +3208,23 @@ msgstr ""
 "actie ook toepasbaar als meer dan een item geselecteerd is. Anders zal de "
 "actie alleen toepasbaar zijn als precies een item geselecteerd is."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Blader door het bestandssysteem om een programma te selecteren om te "
 "gebruiken voor deze actie."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Icoon:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Geen icoon"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3233,7 +3232,7 @@ msgstr ""
 "Klik op deze knop om een icoon te selecteren om weer te geven in het "
 "contextmenu naast de actienaam."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3241,41 +3240,41 @@ msgstr ""
 "De volgende parameters zullen ingewisseld worden wanneer de actie toegepast "
 "wordt:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "pad naar het eerst geselecteerde bestand"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "pad naar alle geselecteerde bestanden"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "map die het bestand bevat dat is doorgegeven in %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "mappen die de bestanden bevatten die zijn doorgegeven in %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "het eerst geselecteerde bestandsnaam (zonder pad)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "geselecteerde bestandsnamen (zonder paden)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Toepassingscondities"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Bestandspatroon:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3287,35 +3286,35 @@ msgstr ""
 "meer dan een patroon invoert, moeten de verschillende items gescheiden "
 "moeten worden door een puntkomma (bijv. *.txt; *.odt)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Toepasbaar wanneer de selectie het volgende bevat:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Mappen"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Geluidsbestanden"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Afbeeldingen"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Textbestanden"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Videobestanden"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Andere bestanden"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3340,8 +3339,10 @@ msgstr ""
 "bestand of de map. Daarbij kunt u ook nog aangeven dat de\n"
 "actie alleen moet worden weergeven door bepaalde typen bestanden."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Selecteer een Icoon"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/pl.po b/po/pl.po
index c25cfd62d709340748b1850c6b4d178ff9aed98a..0c2eb916472f15872a0990608194bbde3ffcab1d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-07-29 12:14+0200\n"
 "Last-Translator: Szymon Kałasz <szymon_maestro@gazeta.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -242,13 +242,11 @@ msgstr "Nie można przenosić ani kopiować plików w śmietniku"
 
 #: ../thunar-vfs/thunar-vfs-job.c:831
 msgid "Do you want to overwrite it?"
-msgstr ""
-"Czy chcesz go nadpisać?"
+msgstr "Czy chcesz go nadpisać?"
 
 #: ../thunar-vfs/thunar-vfs-job.c:896
 msgid "Do you want to skip it?"
-msgstr ""
-"Czy chcesz go pominąć?"
+msgstr "Czy chcesz go pominąć?"
 
 #: ../thunar-vfs/thunar-vfs-mime-database.c:1675
 #, c-format
@@ -700,39 +698,38 @@ msgstr ""
 "\" w oknie dialogowym \"Otwórz za pomocą innej aplikacji\"."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Wybierz aplikacjÄ™"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Pliki wykonywalne"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Skrypty języka Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Skrypty języka Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Skrypty języka Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Skrypty powłoki"
 
@@ -827,6 +824,7 @@ msgstr "_Skaluj kolumny"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -993,7 +991,7 @@ msgstr "Następny"
 msgid "Go to the next visited folder"
 msgstr "Przejdź do następnego katalogu"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr "Nie udało się ikony awaryjnej z \"%s\" (%s). Sprawdź swój system!"
@@ -1887,7 +1885,6 @@ msgid "Audio Files"
 msgstr "Pliki Audio"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Pliki Graficzne"
 
@@ -3051,34 +3048,34 @@ msgstr "Nie udało się zapisać akcji na dysku."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "Nazwa:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Nazwa akcji wyświetlana w menu kontekstowym."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "Opis:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
 msgstr ""
 "Opis akcji wyświetlany na pasku statusu podczas wybierania pozycji w menu."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Polecenie:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3094,27 +3091,27 @@ msgstr ""
 "przeciwnym wypadku, możliwe jest uruchomienie polecenia tylko dla jednego "
 "pliku."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "Przeglądaj system plików w poszukiwaniu aplikacji do uruchomienia."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Ikona:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Brak ikony"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
 msgstr "Naciśnij ten przycisk aby wybrać ikonę, wyświetlaną w menu obok akcji."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3122,41 +3119,41 @@ msgstr ""
 "Poniższe parametry polecenia zostaną\n"
 "zastÄ…pione przy uruchamianiu akcji:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "ścieżka do pierwszego zaznaczonego pliku"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "ścieżki do wszystkich zaznaczonych plików"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "nazwa katalogu, w którym znajduje się plik %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "katalogi, w których znajdują się pliki zawarte w %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "nazwa pierwszego zaznaczonego pliku"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "nazwy zaznaczonych plików"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Warunki pokazywania"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Wzorzec pliku:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3167,35 +3164,35 @@ msgstr ""
 "danego pliku. Jeśli chcesz wprowadzić więcej niż jeden wzorzec, powinny one "
 "być oddzielone średnikami, np.: *.txt;*.doc."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Dostępne, gdy zaznaczenie zawiera:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Katalogi"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "Pliki _dźwiękowe"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Pliki _graficzne"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Pliki _tekstowe"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Filmy _wideo"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Inne pliki"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3217,8 +3214,10 @@ msgstr ""
 "do niego pasować. Ponadto możesz określić\n"
 "dostępność akcji tylko dla pewnego rodzaju plików."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Wybierz ikonÄ™"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 801c31049f9fab08fcb7af898719bd5edc80f0e9..1c943c38ffe2dd92b832c39d9bf9d93861b079d9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-06-04 15:12-0300\n"
 "Last-Translator: Adriano Winter Bess <awbess@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -717,39 +717,38 @@ msgstr ""
 "arquivos."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Selecione uma Aplicação"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Arquivos Executáveis"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Scripts de Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Scripts de Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Scripts de Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Scripts de Shell"
 
@@ -846,6 +845,7 @@ msgstr "_Expandir automaticamente as colunas quando necessário"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1012,7 +1012,7 @@ msgstr "Avançar"
 msgid "Go to the next visited folder"
 msgstr "Vai para a próxima pasta visitada"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1906,7 +1906,6 @@ msgid "Audio Files"
 msgstr "Arquivos de Áudio"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Arquivos de Imagem"
 
@@ -3070,23 +3069,23 @@ msgstr "Falha em salvar ações no disco."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Básico"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "O nome da ação que será mostrado no menu de contexto."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Descrição:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3094,11 +3093,11 @@ msgstr ""
 "A descrição da ação que será mostrada como dica na barra de status quando o "
 "item for selecionado no menu de contexto."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Comando:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3114,23 +3113,23 @@ msgstr ""
 "aplicável mesmo se mais de um item estiver selecionado. Caso contrário a "
 "ação apenas será aplicável se exatamente um item estiver selecionado."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Navegue pelo sistema de arquivos para selecionar uma aplicação a ser usada "
 "para esta ação."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Ícone:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Sem icone"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3138,7 +3137,7 @@ msgstr ""
 "Clique este botão para selecionar um arquivo de ícone que será mostrado no "
 "menu de contexto além do nome da ação escolhido acima."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3146,41 +3145,41 @@ msgstr ""
 "Os seguintes parâmetros do comando serão\n"
 "substituídos ao executar a ação:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "o caminho para o primeiro arquivo selecionado"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "os caminhos para todos os arquivos selecionados"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "o diretório contendo o arquivo obtido em %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "os diretórios contendo os arquivos obtidos em %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "o primeiro nome de arquivo selecionado (sem o caminho)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "os nomes de arquivo selecionados (sem os caminhos)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Condições de Aparência"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "Padrão de _Arquivo:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3192,35 +3191,35 @@ msgstr ""
 "um padrão aqui, os itens da lista devem ser separados com ponto-e-vírgula "
 "(por exemplo *.txt;*.doc). "
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Aparece se a seleção contém:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Diretórios"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Arquivos de Audio"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "Arquivos de _Imagem"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "Arquivos _Texto"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "Arquivos de _Video"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Outros Arquivos"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3244,8 +3243,10 @@ msgstr ""
 "Além disto, você pode especificar que a ação só\n"
 "deva aparecer para determinados tipos de arquivos."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Selecione um Ícone"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/ro.po b/po/ro.po
index 6f09bb8415d859633cb6f4b528e2251736c1295e..075e9f0e6e3dae1d8e98a82ad5f4aab90c27d8f3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-06-05 00:42+0300\n"
 "Last-Translator: MiÅŸu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -720,39 +720,38 @@ msgstr ""
 "personalizate în dialogul „Deschide cu” al administratorului de fişiere."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Selectaţi o aplicaţie"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Toate fiÅŸierele"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "FiÅŸiere executabile"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Scripturi Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Scripturi Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Scripturi Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Scripturi shell"
 
@@ -848,6 +847,7 @@ msgstr "E_xtinde coloanele automat după nevoie"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Necunoscut(ă)"
 
@@ -1013,7 +1013,7 @@ msgstr "ÃŽnainte"
 msgid "Go to the next visited folder"
 msgstr "Înainte în următorul director vizitat"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1925,7 +1925,6 @@ msgid "Audio Files"
 msgstr "FiÅŸiere audio"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "FiÅŸiere imagini"
 
@@ -3100,23 +3099,23 @@ msgstr "Nu s-au putut salva pe disc acţiunile."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Iniţiale"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Nume:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Numele acţiunii pentru afişarea în meniul contextual. "
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Descriere:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3124,11 +3123,11 @@ msgstr ""
 "Descriere a acţiunii pentru afişarea ca indiciu în bara de stare când acest "
 "element este selectat în meniul contextual."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Comandă:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3144,23 +3143,23 @@ msgstr ""
 "multe elemente. Altfel, acţiunea se va aplica doar dacă un singur element "
 "este selectat."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Navigare în sistemul de fişiere pentru selectarea unei aplicaţii de utilizat "
 "pentru această acţiune."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Iconiţă:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Fără iconiţă"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3168,7 +3167,7 @@ msgstr ""
 "Daţi click pe acest buton pentru a selecta o iconiţă ce va fi afişată în "
 "meniul contextual în dreptul numelui acţiunii selectate mai sus."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3176,41 +3175,41 @@ msgstr ""
 "Următorii parametri în linie de comandă\n"
 "vor fi substituiţi la lansarea acţiunii:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "calea primului fiÅŸier selectat"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "căile către toate fişierele selectate"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "directorul conţinând fişierul precizat în %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "directoarele conţinând fişierele precizate în %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "primul fişier selectat (fără cale)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "fişierele selectate (fără căi)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Condiţii de afişare"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "Tip de _fiÅŸiere:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3222,35 +3221,35 @@ msgstr ""
 "specificaţi mai mult de un tip de fişiere aici, elementele listei trebuie "
 "separate prin „punct şi virgulă” (de ex.: *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Apare dacă selecţia conţine:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Directoare"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "FiÅŸiere _audio"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "FiÅŸiere _imagini"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "FiÅŸiere _text"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "FiÅŸiere _video"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "A_lte fiÅŸiere"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3274,8 +3273,10 @@ msgstr ""
 "În plus, puteţi specifica ca afişarea acţiunii să\n"
 "se facă doar pentru anumite tipuri de fişiere."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Selectaţi o iconiţă"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/ru.po b/po/ru.po
index c43750a183429649a2bc3935d6d6d74654995e01..2405f9f818d786527f80af35d48a4923d2f28a66 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-04-25 20:35+0600\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -718,39 +718,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Выберите приложение"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Все файлы"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Исполняемые файлы"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Скрипты Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Скрипты Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Скрипты Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Скрипты Shell"
 
@@ -846,6 +845,7 @@ msgstr "_Автоматически увеличивать ширину стол
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -1013,7 +1013,7 @@ msgstr "Вперёд"
 msgid "Go to the next visited folder"
 msgstr "Перейти к следующей посещённой папке"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1919,7 +1919,6 @@ msgid "Audio Files"
 msgstr "Аудиофайлы"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Изображения"
 
@@ -3090,23 +3089,23 @@ msgstr "Не удалось сохранить действия на диск."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Основное"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Название действия, которое будет отображено в контекстном меню."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Описание:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3114,11 +3113,11 @@ msgstr ""
 "Описание действия, которое будет отображено в подсказке в строке состояния, "
 "когда действие будет выбрано в контекстном меню."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Команда:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3133,23 +3132,23 @@ msgstr ""
 "нескольким выбранным объектам. Иначе, действие будет применено только если "
 "выбран один объект."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Просмотреть файловую систему, чтобы выбрать приложение, которое будет "
 "использовано в этом действии."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Значок:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Без значка"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3157,7 +3156,7 @@ msgstr ""
 "Нажмите эту кнопку, чтобы выбрать файл со значком, который будет отображён в "
 "контекстном меню вместе с названием действия."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3165,41 +3164,41 @@ msgstr ""
 "Следующие параметры будут\n"
 "подставлены при запуске действия:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "путь к первому выбранному файлу"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "пути ко всем выбранным файлам"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "папка, содержащая файл, который передан через %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "папки, содержащая файлы, которые переданы через %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "имя первого из выбранных файлов (без пути)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "выбранные имена файлов (без пути)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Условия появления"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Шаблон имени файла:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3210,35 +3209,35 @@ msgstr ""
 "должно ли это действие отображаться для данного файла. При указании "
 "нескольких шаблонов, разделяйте их точкой с запятой (напр. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Появляться, если выделение содержит:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Папки"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Аудиофайлы"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Изображения"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Текстовые файлы"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Видеофайлы"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Другие файлы"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3263,8 +3262,10 @@ msgstr ""
 "будут появляться только для определённых\n"
 "типов файлов."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Выбор значка"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/sv.po b/po/sv.po
index 3b1697d82867f567d3f18e4e9566a7990f8a5205..bd82b1535ff2849ae93884b2e9ae8c54daf2e663 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-02-22 16:28+0100\n"
 "Last-Translator: Alexander Toresson <alexander.toresson@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -713,39 +713,38 @@ msgstr ""
 "i \"Öppna med\"-dialogen i filhanteraren."
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Välj ett program"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Alla filer"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Körbara filer"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl-skript"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python-skript"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby-skript"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shellskript"
 
@@ -841,6 +840,7 @@ msgstr "_Expandera kolumnerna automatiskt vid behov"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -1008,7 +1008,7 @@ msgstr "Framåt"
 msgid "Go to the next visited folder"
 msgstr "Gå till nästa besökta mapp"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1898,7 +1898,6 @@ msgid "Audio Files"
 msgstr "Ljudfiler"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Bildfiler"
 
@@ -3050,23 +3049,23 @@ msgstr "Misslyckades att spara åtgärder till disk."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Enkel"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Namnet på åtgärden som ska visas i kontextmenyn."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Beskrivning:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3074,11 +3073,11 @@ msgstr ""
 "Beskrivningen för åtgärden som kommer att visas som verktygstips i "
 "statuslisten när objektet markeras från kontextmenyn."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Kommando:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3094,23 +3093,23 @@ msgstr ""
 "genomförbara även om fler än ett objekt är markerat. Annars kommer åtgärden "
 "endast vara genomförbar om exakt ett objekt är markerat."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "Bläddra i filsystemet för att välja ett program att använda för den här "
 "åtgärden."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Ikon:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Ingen ikon"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3118,7 +3117,7 @@ msgstr ""
 "Klicka på den här knappen för att välja en ikonfil som kommer att visas i "
 "kontextmenyn i tillägg till åtgärdsnamnet som anges ovan."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3126,41 +3125,41 @@ msgstr ""
 "Följande kommandoparametrar kommer att\n"
 "ersättas när åtgärden startas:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "sökvägen till den första markerade filen"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "sökvägarna till alla markerade filer"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "katalog som innehåller filen som skickas i %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "kataloger som innehåller filerna som skickas i %F"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "det första markerade filnamnet (utan sökväg)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "de markerade filnamnen (utan sökvägar)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Beteendevillkor"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Filmönster:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3171,35 +3170,35 @@ msgstr ""
 "här åtgärden ska visas för en markerad fil. Om du anger fler än ett mönster "
 "här måste listobjekten avgränsas med semikolon (exempelvis *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "Visas om markeringen innehåller:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Kataloger"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Ljudfiler"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Bildfiler"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Textfiler"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Videofiler"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "Ö_vriga filer"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3221,8 +3220,10 @@ msgstr ""
 "matcha namnet på filen eller mappen. Du kan även\n"
 "ange att åtgärden endast ska visas för vissa sorters filer. "
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Välj en ikon"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/uk.po b/po/uk.po
index e80157fd49162ccb04981d65a61c039b4d93bc53..9fea819d70f0688bb8fdbe4606eaf6b34f1621e1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-04-20 17:07+0300\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -717,39 +717,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "Виберіть програму"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "Усі файли"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "Виконувані файли"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Сценарії Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Сценарії Python"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Сценарії Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Сценарії оболонки"
 
@@ -845,6 +844,7 @@ msgstr "_Автоматично збільшувати ширину стовпч
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "Невідомо"
 
@@ -1010,7 +1010,7 @@ msgstr "Вперед"
 msgid "Go to the next visited folder"
 msgstr "Перейти до наступної відвіданої теки"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr ""
@@ -1916,7 +1916,6 @@ msgid "Audio Files"
 msgstr "Звукові файли"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "Зображення"
 
@@ -3087,23 +3086,23 @@ msgstr "Не вдається створити дії на диск."
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "Основне"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "Назва дії, яка буде відображатись у контекстному меню."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "_Опис:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
@@ -3111,11 +3110,11 @@ msgstr ""
 "Опис дії, яка буде відображатись у підказці у рядку стану, коли дія "
 "вибирається у контекстному меню."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "_Команда:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3129,23 +3128,23 @@ msgstr ""
 "(напр. %F, %D, %N) то дія може застосовуватись до кількох виділених "
 "об'єктів. Інакше, дія буде застосована лише якщо вибрано один об'єкт."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr ""
 "переглянути файлову систему, щоб вибрати програму, яка буде "
 "використовуватись у цій дії."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "_Значок:"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "Без значка"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
@@ -3153,7 +3152,7 @@ msgstr ""
 "Натисніть цю кнопку, щоб вибрати файл із значком, який буде відображений у "
 "контекстному меню разом з назвою дії."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3161,41 +3160,41 @@ msgstr ""
 "наступні параметри будуть\n"
 "підставлені при активації дії:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "шлях до першого виділеного файлу"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "шляхи до усіх виділених файлів"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "тека, що містить файл, який переданий через %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "теки, що містить файли, які передані через %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "назва першого з виділених файлів (без шлаху)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "назви виділених файлів (без шляху)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "Умови появи"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "_Шаблон назви файлу:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3206,35 +3205,35 @@ msgstr ""
 "дія буде відображатись для даного файлу. При вказуванні кількох шаблонів, "
 "розділяйте їх крапкою з комою (напр. *.txt;*.doc)."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "З'являється, якщо виділене містить:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "_Теки"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "_Звукові файли"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "_Зображення"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "_Текстові файли"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "_Відео файли"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "_Інші файли"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3259,8 +3258,10 @@ msgstr ""
 "будуть з'являтись лише для певних\n"
 "типів файлів."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "Виберіть значок"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 78915eff4e0ec28bb4be0da35106522473431eb6..47a106292599ae5520255cdebfb9769f595462e1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-05-03 15:08+0000\n"
 "Last-Translator: Li Linxiao <linxiao.li@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <postmaster@inlsd.org>\n"
@@ -697,39 +697,38 @@ msgid ""
 msgstr ""
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "选择一个应用程序"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "所有文件"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "可执行文件"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl 脚本"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python 脚本"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby 脚本"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell 脚本"
 
@@ -822,6 +821,7 @@ msgstr "按需求自动延展栏位(_E)"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "未知的"
 
@@ -988,7 +988,7 @@ msgstr "向前"
 msgid "Go to the next visited folder"
 msgstr "到下一个浏览的文件夹"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr "无法由 \"%s\" (%s) 载入备用图标。请检查您是否正确安装!"
@@ -1836,7 +1836,6 @@ msgid "Audio Files"
 msgstr "声音文件(_A)"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "图像文件"
 
@@ -2968,33 +2967,33 @@ msgstr "保存动作到磁盘失败。"
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "基础的"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "名称(_N):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "动作名称将在上下文菜单中显示。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
 msgstr "动作描述将在状态栏显示。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "命令(_C):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3006,67 +3005,67 @@ msgstr ""
 "此动作的命令(包含必要的参数)。在下面查看支持的变量用于代替调用命令。使用大写"
 "字母(例如 %F, %D, %N)动作将用于多个选择的项目,除此之外将仅作用于所选项。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "浏览文件系统为此动作选择应用程序。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "图标(_I):"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "没有图标"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
 msgstr "点击此按钮为动作选择图标。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
 msgstr "调用动作时下面的参数将被替换:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "第一个被选取文件的路径"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "所有被选取文件的路径"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "包含文件的目录之前在 %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "包含文件的目录之前在 %f"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "第一个被选取的文件名"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "选择的文件名(没有路径)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "界面风格"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "文件类型(_F):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3076,35 +3075,35 @@ msgstr ""
 "输入模式列表用于决定此动作是否应被用于显示选择的文件。如果多于一个模式,用分"
 "号分隔(例如 *.txt;*.doc)。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "如果选择显示:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "目录(_D)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "声音文件(_A)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "图像文件(_I);"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "文本文件(_T)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "视频文件(_V)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "其他文件(_O)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3122,8 +3121,10 @@ msgstr ""
 "至少列表中类型之一符合文件与文件夹。附加的,您可以\n"
 "指定特有文件的动作。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "选择一个图标"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7df47bd3f0011fd6ce20ce76c9cbebaf1d0e65d1..bb3083452bdebfc36ee4be6b4c0ccf2afa5a95b5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.3.2beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-13 00:53+0200\n"
+"POT-Creation-Date: 2006-08-26 17:25+0200\n"
 "PO-Revision-Date: 2006-08-20 01:07+0800\n"
 "Last-Translator: Cosmo Chene <cosmolax@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -695,39 +695,38 @@ msgstr ""
 "啟方式。"
 
 #: ../thunar/thunar-chooser-dialog.c:813
-#: ../plugins/thunar-uca/thunar-uca-editor.c:491
+#: ../plugins/thunar-uca/thunar-uca-editor.c:490
 msgid "Select an Application"
 msgstr "選擇一個應用程式"
 
 #: ../thunar/thunar-chooser-dialog.c:823
 #: ../thunar/thunar-renamer-dialog.c:1095
-#: ../plugins/thunar-uca/thunar-uca-editor.c:501
-#: ../plugins/thunar-uca/thunar-uca-editor.c:654
+#: ../plugins/thunar-uca/thunar-uca-editor.c:500
 msgid "All Files"
 msgstr "所有檔案"
 
 #: ../thunar/thunar-chooser-dialog.c:828
-#: ../plugins/thunar-uca/thunar-uca-editor.c:506
+#: ../plugins/thunar-uca/thunar-uca-editor.c:505
 msgid "Executable Files"
 msgstr "可執行檔"
 
 #: ../thunar/thunar-chooser-dialog.c:843
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:520
 msgid "Perl Scripts"
 msgstr "Perl 指令稿"
 
 #: ../thunar/thunar-chooser-dialog.c:849
-#: ../plugins/thunar-uca/thunar-uca-editor.c:527
+#: ../plugins/thunar-uca/thunar-uca-editor.c:526
 msgid "Python Scripts"
 msgstr "Python 指令稿"
 
 #: ../thunar/thunar-chooser-dialog.c:855
-#: ../plugins/thunar-uca/thunar-uca-editor.c:533
+#: ../plugins/thunar-uca/thunar-uca-editor.c:532
 msgid "Ruby Scripts"
 msgstr "Ruby 指令稿"
 
 #: ../thunar/thunar-chooser-dialog.c:861
-#: ../plugins/thunar-uca/thunar-uca-editor.c:539
+#: ../plugins/thunar-uca/thunar-uca-editor.c:538
 msgid "Shell Scripts"
 msgstr "Shell 指令稿"
 
@@ -820,6 +819,7 @@ msgstr "依需求自動延展欄位(_E)"
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:287
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:288
+#: ../plugins/thunar-uca/thunar-uca-editor.c:609
 msgid "Unknown"
 msgstr "未知的"
 
@@ -983,7 +983,7 @@ msgstr "往後"
 msgid "Go to the next visited folder"
 msgstr "到後一個瀏覽的資料夾"
 
-#: ../thunar/thunar-icon-factory.c:676
+#: ../thunar/thunar-icon-factory.c:675
 #, c-format
 msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
 msgstr "無法由 \"%s\" (%s) 載入備用圖示。請檢查您是否正確安裝!"
@@ -1835,7 +1835,6 @@ msgid "Audio Files"
 msgstr "音效檔"
 
 #: ../thunar/thunar-renamer-dialog.c:1105
-#: ../plugins/thunar-uca/thunar-uca-editor.c:659
 msgid "Image Files"
 msgstr "圖片檔"
 
@@ -2959,34 +2958,34 @@ msgstr "無法儲存動作到磁碟中。"
 #.
 #. Basic
 #.
-#: ../plugins/thunar-uca/thunar-uca-editor.c:136
+#: ../plugins/thunar-uca/thunar-uca-editor.c:135
 msgid "Basic"
 msgstr "一般"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:145
+#: ../plugins/thunar-uca/thunar-uca-editor.c:144
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:150
+#: ../plugins/thunar-uca/thunar-uca-editor.c:149
 msgid "The name of the action that will be displayed in the context menu."
 msgstr "將出現在右鍵選單中的動作名稱。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:163
+#: ../plugins/thunar-uca/thunar-uca-editor.c:162
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:168
+#: ../plugins/thunar-uca/thunar-uca-editor.c:167
 msgid ""
 "The description of the action that will be displayed as tooltip in the "
 "statusbar when selecting the item from the context menu."
 msgstr ""
 "當您在滑鼠右鍵選單中選取特定功能時,此功能的相關描述將出現在狀態列的提示中。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:181
+#: ../plugins/thunar-uca/thunar-uca-editor.c:180
 msgid "_Command:"
 msgstr "指令(_C):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:190
+#: ../plugins/thunar-uca/thunar-uca-editor.c:189
 msgid ""
 "The command (including the necessary parameters) to perform the action. See "
 "the command parameter legend below for a list of supported parameter "
@@ -3001,28 +3000,28 @@ msgstr ""
 "數時,即使有下其他參數大寫字母關聯的動作也會被優先執行。如果選取了 超過一個項"
 "目, Else the action will only be applicable if exactly one item is selected."
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:201
+#: ../plugins/thunar-uca/thunar-uca-editor.c:200
 msgid "Browse the file system to select an application to use for this action."
 msgstr "瀏覽檔案系統尋找可以執行此動作的應用程式。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:217
+#: ../plugins/thunar-uca/thunar-uca-editor.c:216
 msgid "_Icon:"
 msgstr "圖示(_I):"
 
 #. setup a label to tell that no icon was selected
-#: ../plugins/thunar-uca/thunar-uca-editor.c:225
-#: ../plugins/thunar-uca/thunar-uca-editor.c:767
+#: ../plugins/thunar-uca/thunar-uca-editor.c:224
+#: ../plugins/thunar-uca/thunar-uca-editor.c:709
 msgid "No icon"
 msgstr "無圖示"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:226
+#: ../plugins/thunar-uca/thunar-uca-editor.c:225
 msgid ""
 "Click this button to select an icon file that will be displayed in the "
 "context menu in addition to the action name chosen above."
 msgstr ""
 "請按此按鈕以選擇圖示檔,此圖示會出現在右鍵選單以代表您在上面所設的動作。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:257
+#: ../plugins/thunar-uca/thunar-uca-editor.c:256
 msgid ""
 "The following command parameters will be\n"
 "substituted when launching the action:"
@@ -3030,41 +3029,41 @@ msgstr ""
 "當啟動此動作時,以下的\n"
 "命令參數都將被取代:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:295
+#: ../plugins/thunar-uca/thunar-uca-editor.c:294
 msgid "the path to the first selected file"
 msgstr "首選檔案的路徑"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:307
+#: ../plugins/thunar-uca/thunar-uca-editor.c:306
 msgid "the paths to all selected files"
 msgstr "所選檔案的路徑"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:319
+#: ../plugins/thunar-uca/thunar-uca-editor.c:318
 #, c-format
 msgid "directory containing the file that is passed in %f"
 msgstr "包含檔案的目錄已在 %f 中被略過"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:331
+#: ../plugins/thunar-uca/thunar-uca-editor.c:330
 #, c-format
 msgid "directories containing the files that are passed in %F"
 msgstr "包含檔案的目錄已在 %F 中被略過"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:343
+#: ../plugins/thunar-uca/thunar-uca-editor.c:342
 msgid "the first selected filename (without path)"
 msgstr "首選檔名·(忽略路徑)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:355
+#: ../plugins/thunar-uca/thunar-uca-editor.c:354
 msgid "the selected filenames (without paths)"
 msgstr "所選檔名·(忽略路徑)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:369
+#: ../plugins/thunar-uca/thunar-uca-editor.c:368
 msgid "Appearance Conditions"
 msgstr "執行條件"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:377
+#: ../plugins/thunar-uca/thunar-uca-editor.c:376
 msgid "_File Pattern:"
 msgstr "檔案關鍵字(_F):"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:382
+#: ../plugins/thunar-uca/thunar-uca-editor.c:381
 msgid ""
 "Enter a list of patterns that will be used to determine whether this action "
 "should be displayed for a selected file. If you specify more than one "
@@ -3074,35 +3073,35 @@ msgstr ""
 "輸入一些字眼以便於偵測此動作是否應出現於所選檔案,如果要輸入超過一個字眼,那"
 "麼請以半型分號將其隔開(e.g.·*.txt;*.doc)。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:401
+#: ../plugins/thunar-uca/thunar-uca-editor.c:400
 msgid "Appears if selection contains:"
 msgstr "執行條件為所選項目包含以下:"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:414
+#: ../plugins/thunar-uca/thunar-uca-editor.c:413
 msgid "_Directories"
 msgstr "目錄(_D)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:418
+#: ../plugins/thunar-uca/thunar-uca-editor.c:417
 msgid "_Audio Files"
 msgstr "音效檔(_A)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:422
+#: ../plugins/thunar-uca/thunar-uca-editor.c:421
 msgid "_Image Files"
 msgstr "圖片檔(_I)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:426
+#: ../plugins/thunar-uca/thunar-uca-editor.c:425
 msgid "_Text Files"
 msgstr "文字檔(_T)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:431
+#: ../plugins/thunar-uca/thunar-uca-editor.c:430
 msgid "_Video Files"
 msgstr "影片檔(_V)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:435
+#: ../plugins/thunar-uca/thunar-uca-editor.c:434
 msgid "_Other Files"
 msgstr "其他檔案(_O)"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:452
+#: ../plugins/thunar-uca/thunar-uca-editor.c:451
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3126,8 +3125,10 @@ msgstr ""
 "設定好只有在接觸這些檔案時才會出現的右鍵選單\n"
 "動作。"
 
-#: ../plugins/thunar-uca/thunar-uca-editor.c:644
-msgid "Select an Icon"
+#. allocate the chooser dialog
+#: ../plugins/thunar-uca/thunar-uca-editor.c:612
+#, fuzzy, c-format
+msgid "Select an Icon for \"%s\""
 msgstr "選擇圖示"
 
 #: ../plugins/thunar-uca/thunar-uca-model.c:780
diff --git a/thunar-vfs/Makefile.am b/thunar-vfs/Makefile.am
index f7ae04363b88f39d782ed82039ded7679ada101e..8403f171530f7ae1fb084a43cbd987ec099d22e3 100644
--- a/thunar-vfs/Makefile.am
+++ b/thunar-vfs/Makefile.am
@@ -170,6 +170,20 @@ thunar_vfs_mime_cleaner_1_LDFLAGS =					\
 	-no-undefined							\
 	$(PLATFORM_LDFLAGS)
 
+thunar_vfs_pixbuf_thumbnailer_1_SOURCES =				\
+	thunar-vfs-pixbuf-thumbnailer.c
+
+thunar_vfs_pixbuf_thumbnailer_1_CFLAGS =				\
+	$(EXO_CFLAGS)							\
+	$(PLATFORM_CFLAGS)
+
+thunar_vfs_pixbuf_thumbnailer_1_LDADD =					\
+	$(EXO_LIBS)
+
+thunar_vfs_pixbuf_thumbnailer_1_LDFLAGS =				\
+	-no-undefined							\
+	$(PLATFORM_LDFLAGS)
+
 thunar_vfs_update_thumbnailers_cache_1_SOURCES =			\
 	thunar-vfs-update-thumbnailers-cache.c
 
@@ -188,19 +202,30 @@ thunar_vfs_update_thumbnailers_cache_1_LDFLAGS =			\
 	-no-undefined							\
 	$(PLATFORM_LDFLAGS)
 
-thunar_vfs_pixbuf_thumbnailer_1_SOURCES =				\
-	thunar-vfs-pixbuf-thumbnailer.c
+##
+## The font thumbnailer can only be built if freetype 2.x is available,
+## because there's not really a way to make it work w/o freetype.
+##
+if HAVE_FREETYPE
+libexec_PROGRAMS +=							\
+	thunar-vfs-font-thumbnailer-1
 
-thunar_vfs_pixbuf_thumbnailer_1_CFLAGS =				\
+thunar_vfs_font_thumbnailer_1_SOURCES =					\
+	thunar-vfs-font-thumbnailer.c
+
+thunar_vfs_font_thumbnailer_1_CFLAGS =					\
+	$(FREETYPE_CFLAGS)						\
 	$(GDK_PIXBUF_CFLAGS)						\
 	$(PLATFORM_CFLAGS)
 
-thunar_vfs_pixbuf_thumbnailer_1_LDADD =					\
+thunar_vfs_font_thumbnailer_1_LDADD =					\
+	$(FREETYPE_LIBS)						\
 	$(GDK_PIXBUF_LIBS)
 
-thunar_vfs_pixbuf_thumbnailer_1_LDFLAGS =				\
+thunar_vfs_font_thumbnailer_1_LDFLAGS =					\
 	-no-undefined							\
 	$(PLATFORM_LDFLAGS)
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = thunar-vfs-1.pc
diff --git a/thunar-vfs/thunar-vfs-font-thumbnailer.c b/thunar-vfs/thunar-vfs-font-thumbnailer.c
new file mode 100644
index 0000000000000000000000000000000000000000..7b25d206760fe23555cf8f80319121c70ab799b9
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-font-thumbnailer.c
@@ -0,0 +1,434 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Based on code written by James Henstridge <james@daa.com.au> for GNOME.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+
+
+/* --- globals --- */
+static gchar *opt_input = NULL;
+static gchar *opt_output = NULL;
+static gint   opt_size = 64;
+
+
+
+/* --- command line options --- */
+static GOptionEntry entries[] =
+{
+  { "input", 'i', 0, G_OPTION_ARG_FILENAME, &opt_input, "Name of file for which to create a thumbnail", "filename", },
+  { "output", 'o', 0, G_OPTION_ARG_FILENAME, &opt_output, "Name of the file to put the thumbnail", "filename", },
+  { "size", 's', 0, G_OPTION_ARG_INT, &opt_size, "Size of thumbnail in pixels; the thumbnail will be at most N*N pixels large", "N", },
+  { NULL, },
+};
+
+
+
+/* --- functions --- */
+static const gchar*
+tft_ft_strerror (FT_Error error)
+{
+#undef __FTERRORS_H__
+#define FT_ERRORDEF(e,v,s) case e: return s;
+#define FT_ERROR_START_LIST
+#define FT_ERROR_END_LIST
+    switch (error)
+      {
+#include FT_ERRORS_H
+      default:
+        return "unknown";
+      }
+}
+
+
+
+
+static void
+tft_render_glyph (GdkPixbuf *pixbuf,
+                  FT_Face    face,
+                  FT_UInt    glyph,
+                  gint      *pen_x,
+                  gint      *pen_y)
+{
+  FT_GlyphSlot slot = face->glyph;
+  FT_Error     error;
+  guchar      *pixels;
+  guchar       pixel;
+  gint         rowstride;
+  gint         height;
+  gint         width;
+  gint         off_x;
+  gint         off_y;
+  gint         off;
+  gint         i, j;
+
+  /* load the glyph */
+  error = FT_Load_Glyph (face, glyph, FT_LOAD_DEFAULT);
+  if (G_UNLIKELY (error != 0))
+    {
+      g_print ("%s: %s: %s\n", g_get_prgname (), "Could not load glyph", tft_ft_strerror (error));
+      exit (EXIT_FAILURE);
+    }
+
+  /* render the glyph */
+  error = FT_Render_Glyph (slot, ft_render_mode_normal);
+  if (G_UNLIKELY (error != 0))
+    {
+      g_print ("%s: %s: %s\n", g_get_prgname (), "Could not render glyph", tft_ft_strerror (error));
+      exit (EXIT_FAILURE);
+    }
+
+  off_x = *pen_x + slot->bitmap_left;
+  off_y = *pen_y - slot->bitmap_top;
+
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+  width = gdk_pixbuf_get_width (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+
+  for (j = 0; j < slot->bitmap.rows; ++j)
+    {
+      if (j + off_y < 0 || j + off_y >= height)
+        continue;
+
+      for (i = 0; i < slot->bitmap.width; ++i)
+        {
+          if (i + off_x < 0 || i + off_x >= width)
+            continue;
+
+          switch (slot->bitmap.pixel_mode)
+            {
+            case ft_pixel_mode_mono:
+              pixel = slot->bitmap.buffer[j * slot->bitmap.pitch + i / 8];
+              pixel = 255 - ((pixel >> (7 - i % 8)) & 0x1) * 255;
+              break;
+
+            case ft_pixel_mode_grays:
+              pixel = 255 - slot->bitmap.buffer[j * slot->bitmap.pitch + i];
+              break;
+
+            default:
+              pixel = 255;
+              break;
+            }
+
+          off = (j + off_y) * rowstride + 3 * (i + off_x);
+          pixels[off + 0] = pixel;
+          pixels[off + 1] = pixel;
+          pixels[off + 2] = pixel;
+        }
+    }
+
+  *pen_x += slot->advance.x >> 6;
+}
+
+
+
+static GdkPixbuf*
+tft_scale_ratio (GdkPixbuf *source,
+                 gint       dest_size)
+{
+  gdouble wratio;
+  gdouble hratio;
+  gint    source_width;
+  gint    source_height;
+  gint    dest_width;
+  gint    dest_height;
+
+  source_width  = gdk_pixbuf_get_width  (source);
+  source_height = gdk_pixbuf_get_height (source);
+
+  wratio = (gdouble) source_width  / (gdouble) dest_size;
+  hratio = (gdouble) source_height / (gdouble) dest_size;
+
+  if (hratio > wratio)
+    {
+      dest_width  = rint (source_width / hratio);
+      dest_height = dest_size;
+    }
+  else
+    {
+      dest_width  = dest_size;
+      dest_height = rint (source_height / wratio);
+    }
+
+  return gdk_pixbuf_scale_simple (source, MAX (dest_width, 1), MAX (dest_height, 1), GDK_INTERP_HYPER);
+}
+
+
+
+static gboolean
+tft_save_pixbuf (GdkPixbuf *pixbuf,
+                 GError   **error)
+{
+  GdkPixbuf *subpixbuf;
+  GdkPixbuf *scaled;
+  gboolean   seen_pixel;
+  gboolean   succeed;
+  guchar    *pixels;
+  gint       rowstride;
+  gint       height;
+  gint       width;
+  gint       i, j;
+  gint       trim_left;
+  gint       trim_right;
+  gint       trim_top;
+  gint       trim_bottom;
+  gint       offset;
+
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+  width = gdk_pixbuf_get_width (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+
+  for (i = 0; i < width; ++i)
+    {
+      seen_pixel = FALSE;
+      for (j = 0; j < height; ++j)
+        {
+          offset = j * rowstride + 3 * i;
+          seen_pixel = (pixels[offset + 0] != 0xff ||
+                        pixels[offset + 1] != 0xff ||
+                        pixels[offset + 2] != 0xff);
+          if (seen_pixel)
+            break;
+        }
+      
+      if (seen_pixel)
+        break;
+    }
+
+  trim_left = MIN (width, i);
+  trim_left = MAX (trim_left - 8, 0);
+
+  for (i = width - 1; i >= trim_left; --i)
+    {
+      seen_pixel = FALSE;
+      for (j = 0; j < height; ++j)
+        {
+          offset = j * rowstride + 3 * i;
+          seen_pixel = (pixels[offset + 0] != 0xff ||
+                        pixels[offset+1] != 0xff ||
+                        pixels[offset+2] != 0xff);
+          if (seen_pixel)
+            break;
+        }
+      
+      if (seen_pixel)
+        break;
+    }
+
+  trim_right = MAX (trim_left, i);
+  trim_right = MIN (trim_right + 8, width - 1);
+
+  for (j = 0; j < height; ++j)
+    {
+      seen_pixel = FALSE;
+      for (i = 0; i < width; ++i)
+        {
+          offset = j * rowstride + 3 * i;
+          seen_pixel = (pixels[offset + 0] != 0xff ||
+                        pixels[offset + 1] != 0xff ||
+                        pixels[offset + 2] != 0xff);
+          if (seen_pixel)
+            break;
+        }
+      
+      if (seen_pixel)
+        break;
+    }
+
+  trim_top = MIN (height, j);
+  trim_top = MAX (trim_top - 8, 0);
+
+  for (j = height - 1; j >= trim_top; --j)
+    {
+      seen_pixel = FALSE;
+      for (i = 0; i < width; ++i)
+        {
+          offset = j * rowstride + 3 * i;
+          seen_pixel = (pixels[offset + 0] != 0xff ||
+                        pixels[offset + 1] != 0xff ||
+                        pixels[offset + 2] != 0xff);
+          if (seen_pixel)
+            break;
+        }
+      
+      if (seen_pixel)
+        break;
+    }
+
+  trim_bottom = MAX (trim_top, j);
+  trim_bottom = MIN (trim_bottom + 8, height - 1);
+
+  /* determine the trimmed subpixbuf */
+  subpixbuf = gdk_pixbuf_new_subpixbuf (pixbuf, trim_left, trim_top, trim_right - trim_left, trim_bottom - trim_top);
+
+  /* check if we still need to scale down */
+  if (gdk_pixbuf_get_width (subpixbuf) > opt_size || gdk_pixbuf_get_height (subpixbuf) > opt_size)
+    {
+      scaled = tft_scale_ratio (subpixbuf, opt_size);
+      g_object_unref (G_OBJECT (subpixbuf));
+      subpixbuf = scaled;
+    }
+  
+  succeed = gdk_pixbuf_save (subpixbuf, opt_output, "png", error, NULL);
+  g_object_unref (G_OBJECT (subpixbuf));
+
+  return succeed;
+}
+
+
+
+int
+main (int argc, char **argv)
+{
+  GOptionContext *context;
+  FT_Library      library;
+  GdkPixbuf      *pixbuf;
+  FT_Error        error;
+  FT_UInt         glyph1;
+  FT_UInt         glyph2;
+  FT_Face         face;
+  GError         *err = NULL;
+  gint            pen_x;
+  gint            pen_y;
+  gint            n;
+
+  /* parse the command line options */
+  context = g_option_context_new ("- Create font thumbnails");
+  g_option_context_add_main_entries (context, entries, NULL);
+  g_option_context_set_help_enabled (context, TRUE);
+  if (!g_option_context_parse (context, &argc, &argv, &err))
+    {
+      g_print ("%s: %s\n", g_get_prgname (), err->message);
+      return EXIT_FAILURE;
+    }
+
+  /* verify that an input file was specified */
+  if (G_UNLIKELY (opt_input == NULL))
+    {
+      g_print ("%s: %s\n", g_get_prgname (), "No input file specified");
+      return EXIT_FAILURE;
+    }
+
+  /* verify that an output file was specified */
+  if (G_UNLIKELY (opt_output == NULL))
+    {
+      g_print ("%s: %s\n", g_get_prgname (), "No output file specified");
+      return EXIT_FAILURE;
+    }
+
+  /* verify the specified size */
+  if (G_UNLIKELY (opt_size < 1))
+    {
+      g_print ("%s: %s\n", g_get_prgname (), "The specified size is invalid");
+      return EXIT_FAILURE;
+    }
+
+  /* initialize the freetype library */
+  error = FT_Init_FreeType (&library);
+  if (G_UNLIKELY (error != 0))
+    {
+      g_print ("%s: %s: %s\n", g_get_prgname (), "Could not initialize freetype", tft_ft_strerror (error));
+      return EXIT_FAILURE;
+    }
+
+  /* try to open the input file */
+  error = FT_New_Face (library, opt_input, 0, &face);
+  if (G_UNLIKELY (error != 0))
+    {
+      g_print ("%s: %s: %s\n", g_get_prgname (), "Could not open the input file", tft_ft_strerror (error));
+      return EXIT_FAILURE;
+    }
+
+  /* set the pixel size */
+  error = FT_Set_Pixel_Sizes (face, 0, opt_size);
+  if (G_UNLIKELY (error != 0))
+    {
+      g_print ("%s: %s: %s\n", g_get_prgname (), "Could not set the pixel size", tft_ft_strerror (error));
+      return EXIT_FAILURE;
+    }
+
+  /* set the character map */
+  for (n = 0; n < face->num_charmaps; ++n)
+    {
+      /* check for a desired character map */
+      if (face->charmaps[n]->encoding == ft_encoding_latin_1
+          || face->charmaps[n]->encoding == ft_encoding_unicode
+          || face->charmaps[n]->encoding == ft_encoding_apple_roman)
+        {
+          /* try to set the character map */
+          error = FT_Set_Charmap (face, face->charmaps[n]);
+          if (G_UNLIKELY (error != 0))
+            {
+              g_print ("%s: %s: %s\n", g_get_prgname (), "Could not set the character map", tft_ft_strerror (error));
+              return EXIT_FAILURE;
+            }
+          break;
+        }
+    }
+
+  /* determine preferred glyphs for the thumbnail (with appropriate fallbacks) */
+  glyph1 = FT_Get_Char_Index (face, 'A');
+  if (G_UNLIKELY (glyph1 == 0))
+    glyph1 = MIN (65, face->num_glyphs - 1);
+  glyph2 = FT_Get_Char_Index (face, 'a');
+  if (G_UNLIKELY (glyph2 == 0))
+    glyph2 = MIN (97, face->num_glyphs - 1);
+
+  /* initialize the GType system */
+  g_type_init ();
+
+  /* allocate a pixbuf for the thumbnail */
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, opt_size * 3, (opt_size * 3) / 2);
+  gdk_pixbuf_fill (pixbuf, 0xffffffff);
+
+  /* initial pen position */
+  pen_x = opt_size / 2;
+  pen_y = opt_size;
+
+  /* render the letters to the pixbuf */
+  tft_render_glyph (pixbuf, face, glyph1, &pen_x, &pen_y);
+  tft_render_glyph (pixbuf, face, glyph2, &pen_x, &pen_y);
+
+  /* save the pixbuf */
+  if (!tft_save_pixbuf (pixbuf, &err))
+    {
+      g_print ("%s: %s: %s\n", g_get_prgname (), "Could not save thumbnail", err->message);
+      return EXIT_FAILURE;
+    }
+
+  return EXIT_SUCCESS;
+}
diff --git a/thunar-vfs/thunar-vfs-pixbuf-thumbnailer.c b/thunar-vfs/thunar-vfs-pixbuf-thumbnailer.c
index 9a8b4b5b31ae65edbedb96399ff4155a087e591f..5e71986facdd53afabf2f83e390b0492bb0f8c67 100644
--- a/thunar-vfs/thunar-vfs-pixbuf-thumbnailer.c
+++ b/thunar-vfs/thunar-vfs-pixbuf-thumbnailer.c
@@ -31,90 +31,21 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-/* use g_open() on win32 */
-#if GLIB_CHECK_VERSION(2,6,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_open(path, flags, mode) (open ((path), (flags), (mode)))
-#endif
-
-
-
-static void
-size_prepared (GdkPixbufLoader *loader,
-               gint             width,
-               gint             height,
-               gpointer         user_data)
-{
-  gdouble wratio;
-  gdouble hratio;
-  gint    size = GPOINTER_TO_INT (user_data);
-
-  /* check if we need to scale down */
-  if (G_LIKELY (width > size || height > size))
-    {
-      /* calculate the new dimensions */
-      wratio = (gdouble) width / (gdouble) size;
-      hratio = (gdouble) height / (gdouble) size;
-
-      if (hratio > wratio)
-        {
-          width = rint (width / hratio);
-          height = size;
-        }
-      else
-        {
-          width = size;
-          height = rint (height / wratio);
-        }
-
-      /* apply the new dimensions */
-      gdk_pixbuf_loader_set_size (loader, MAX (width, 1), MAX (height, 1));
-    }
-}
+#include <exo/exo.h>
 
 
 
 int
 main (int argc, char **argv)
 {
-  GdkPixbufLoader *loader;
-  struct stat      statb;
-  GdkPixbuf       *pixbuf;
-  GError          *err = NULL;
-  guchar          *buffer;
-  gint             size;
-  gint             fd;
-  gint             n;
+  GdkPixbuf *pixbuf;
+  GError    *err = NULL;
+  glong      size;
 
   /* check the command line parameters */
   if (G_UNLIKELY (argc != 4))
@@ -127,95 +58,20 @@ main (int argc, char **argv)
   size = strtol (argv[1], NULL, 10);
   if (G_UNLIKELY (size < 1 || size > 256))
     {
-      fprintf (stderr, "%s: Invalid size %d.\n", argv[0], size);
+      fprintf (stderr, "%s: Invalid size %ld.\n", argv[0], size);
       return EXIT_FAILURE;
     }
 
   /* initialize the GType system */
   g_type_init ();
 
-  /* try to open the input file */
-  fd = g_open (argv[2], O_RDONLY, 0000);
-  if (G_UNLIKELY (fd < 0))
+  /* try to load the input image file */
+  pixbuf = exo_gdk_pixbuf_new_from_file_at_max_size (argv[2], size, size, TRUE, &err);
+  if (G_UNLIKELY (pixbuf == NULL))
     {
-err0: fprintf (stderr, "%s: Unable to open %s: %s.\n", argv[0], argv[2], g_strerror (errno));
+      fprintf (stderr, "%s: %s.\n", argv[0], err->message);
       return EXIT_FAILURE;
     }
-
-  /* try to stat the input file */
-  if (fstat (fd, &statb) < 0)
-    goto err0;
-
-  /* verify that we have a regular file here */
-  if (!S_ISREG (statb.st_mode))
-    {
-      errno = EINVAL;
-      goto err0;
-    }
-
-  /* try to allocate the loader */
-  loader = gdk_pixbuf_loader_new ();
-
-  /* connect the "size-prepared" callback */
-  g_signal_connect (G_OBJECT (loader), "size-prepared", G_CALLBACK (size_prepared), GINT_TO_POINTER (size));
-
-#ifdef HAVE_MMAP
-  /* try to mmap() the file if it's smaller than 8MB */
-  if (G_LIKELY (statb.st_size <= 8 * 1024 * 1024))
-    {
-      /* map the image file into memory */
-      buffer = mmap (NULL, statb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-      if (G_UNLIKELY (buffer == MAP_FAILED))
-        goto nommap;
-
-      /* tell the kernel that we'll read sequentially */
-#ifdef HAVE_POSIX_MADVISE
-      posix_madvise (buffer, statb.st_size, POSIX_MADV_SEQUENTIAL);
-#endif
-
-      /* feed the data into the loader */
-      if (!gdk_pixbuf_loader_write (loader, buffer, statb.st_size, &err))
-        goto err1;
-
-      /* unmap the file */
-      munmap (buffer, statb.st_size);
-    }
-  else
-    {
-nommap:
-#endif
-      /* allocate a read buffer */
-      buffer = g_newa (guchar, 8192);
-
-      /* read the file content */
-      for (;;)
-        {
-          /* read the next chunk */
-          n = read (fd, buffer, 8192);
-          if (G_UNLIKELY (n < 0))
-            {
-              fprintf (stderr, "%s: Failed to read file %s: %s\n", argv[0], argv[2], g_strerror (errno));
-              return EXIT_FAILURE;
-            }
-
-          /* feed the data into the loader */
-          if (!gdk_pixbuf_loader_write (loader, buffer, n, &err))
-            {
-err1:         fprintf (stderr, "%s: Failed to read file %s: %s\n", argv[0], argv[2], err->message);
-              return EXIT_FAILURE;
-            }
-        }
-#ifdef HAVE_MMAP
-    }
-#endif
-
-  /* check if we succeed */
-  if (!gdk_pixbuf_loader_close (loader, &err))
-    goto err1;
-
-  /* determine the pixbuf... */
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-
   /* try to save to the target location */
   if (!gdk_pixbuf_save (pixbuf, argv[3], "png", &err, NULL))
     {
diff --git a/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c b/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c
index 5665c5f4eaca007ad2ac3525da672b822f86e585..6a5bf71182f4a0d4cfa38b0d28197344388ec34c 100644
--- a/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c
+++ b/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c
@@ -359,6 +359,33 @@ thumbnailers_load_gnome (GHashTable *thumbnailers)
 
 
 
+static void
+thumbnailers_load_font (GHashTable *thumbnailers)
+{
+  static const gchar *MIME_TYPES[] =
+  {
+    "application/x-font-otf",
+    "application/x-font-pcf",
+    "application/x-font-ttf",
+    "application/x-font-type1",
+  };
+
+  guint n;
+
+  /* check if the thunar-vfs-font-thumbnailer-1 is installed */
+  if (g_file_test (LIBEXECDIR G_DIR_SEPARATOR_S "thunar-vfs-font-thumbnailer-1", G_FILE_TEST_IS_EXECUTABLE))
+    {
+      /* process all mime types supported by the thumbnailer */
+      for (n = 0; n < G_N_ELEMENTS (MIME_TYPES); ++n)
+        {
+          /* set our thumbnailer for all those mime types */
+          g_hash_table_insert (thumbnailers, (gchar *) MIME_TYPES[n], LIBEXECDIR G_DIR_SEPARATOR_S "thunar-vfs-font-thumbnailer-1 -i %i -o %o -s %s");
+        }
+    }
+}
+
+
+
 static void
 thumbnailers_load_pixbuf (GHashTable *thumbnailers)
 {
@@ -467,6 +494,9 @@ main (int argc, char **argv)
   /* load the available GNOME thumbnailers */
   thumbnailers_load_gnome (thumbnailers);
 
+  /* load the available font thumbnailers */
+  thumbnailers_load_font (thumbnailers);
+
   /* load the available gdk-pixbuf thumbnailers */
   thumbnailers_load_pixbuf (thumbnailers);
 
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 4feccbd522b6a9be2ea6c02482a7f4dba9ebf7fd..0f453687a6da39f046835bd24ef572fcebe0fd56 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -72,8 +72,6 @@ Thunar_SOURCES =							\
 	thunar-folder.h							\
 	thunar-gdk-extensions.c						\
 	thunar-gdk-extensions.h						\
-	thunar-gdk-pixbuf-extensions.c					\
-	thunar-gdk-pixbuf-extensions.h					\
 	thunar-gobject-extensions.c					\
 	thunar-gobject-extensions.h					\
 	thunar-gtk-extensions.c						\
diff --git a/thunar/thunar-gdk-pixbuf-extensions.c b/thunar/thunar-gdk-pixbuf-extensions.c
deleted file mode 100644
index 06c3cd9089ffff42e2ba3844b050675c1b816200..0000000000000000000000000000000000000000
--- a/thunar/thunar-gdk-pixbuf-extensions.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Based on code originally written by Eazel, Inc. for the eel utility
- * library.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <thunar/thunar-gdk-pixbuf-extensions.h>
-#include <thunar/thunar-private.h>
-
-
-
-static void
-draw_frame_row (GdkPixbuf *frame_image,
-                gint       target_width,
-                gint       source_width,
-                gint       source_v_position,
-                gint       dest_v_position,
-                GdkPixbuf *result_pixbuf,
-                gint       left_offset,
-                gint       height)
-{
-  gint remaining_width;
-  gint slab_width;
-  gint h_offset;
-  
-  for (h_offset = 0, remaining_width = target_width; remaining_width > 0; h_offset += slab_width, remaining_width -= slab_width)
-    {
-      slab_width = remaining_width > source_width ? source_width : remaining_width;
-      gdk_pixbuf_copy_area (frame_image, left_offset, source_v_position, slab_width, height, result_pixbuf, left_offset + h_offset, dest_v_position);
-    }
-}
-
-
-
-static void
-draw_frame_column (GdkPixbuf *frame_image,
-                   gint       target_height,
-                   gint       source_height,
-                   gint       source_h_position,
-                   gint       dest_h_position,
-                   GdkPixbuf *result_pixbuf,
-                   gint       top_offset,
-                   gint       width)
-{
-  gint remaining_height;
-  gint slab_height;
-  gint v_offset;
-  
-  for (v_offset = 0, remaining_height = target_height; remaining_height > 0; v_offset += slab_height, remaining_height -= slab_height)
-    {
-      slab_height = remaining_height > source_height ? source_height : remaining_height;
-      gdk_pixbuf_copy_area (frame_image, source_h_position, top_offset, width, slab_height, result_pixbuf, dest_h_position, top_offset + v_offset);
-    }
-}
-
-
-
-/**
- * thunar_gdk_pixbuf_frame:
- * @src           : the source #GdkPixbuf.
- * @frame         : the frame #GdkPixbuf.
- * @left_offset   : the left frame offset.
- * @top_offset    : the top frame offset.
- * @right_offset  : the right frame offset.
- * @bottom_offset : the bottom frame offset.
- *
- * Embeds @src in @frame and returns the result as
- * new #GdkPixbuf.
- *
- * The caller is responsible to free the returned
- * #GdkPixbuf using g_object_unref().
- *
- * Return value: the framed version of @src.
- **/
-GdkPixbuf*
-thunar_gdk_pixbuf_frame (GdkPixbuf *src,
-                         GdkPixbuf *frame,
-                         gint       left_offset,
-                         gint       top_offset,
-                         gint       right_offset,
-                         gint       bottom_offset)
-{
-  GdkPixbuf *dst;
-  gint       dst_width;
-  gint       dst_height;
-  gint       frame_width;
-  gint       frame_height;
-  gint       src_width;
-  gint       src_height;
-
-  _thunar_return_val_if_fail (GDK_IS_PIXBUF (src), NULL);
-  _thunar_return_val_if_fail (GDK_IS_PIXBUF (frame), NULL);
-
-  src_width = gdk_pixbuf_get_width (src);
-  src_height = gdk_pixbuf_get_height (src);
-
-  frame_width = gdk_pixbuf_get_width (frame);
-  frame_height = gdk_pixbuf_get_height (frame);
-
-  dst_width = src_width + left_offset + right_offset;
-  dst_height = src_height + top_offset + bottom_offset;
-
-  dst = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, dst_width, dst_height);
-
-  /* fill the destination if the source has an alpha channel */
-  if (G_UNLIKELY (gdk_pixbuf_get_has_alpha (src)))
-    gdk_pixbuf_fill (dst, 0xffffffff);
-
-  /* draw the left top cornder and top row */
-  gdk_pixbuf_copy_area (frame, 0, 0, left_offset, top_offset, dst, 0, 0);
-  draw_frame_row (frame, src_width, frame_width - left_offset - right_offset, 0, 0, dst, left_offset, top_offset);
-
-  /* draw the right top corner and left column */
-  gdk_pixbuf_copy_area (frame, frame_width - right_offset, 0, right_offset, top_offset, dst, dst_width - right_offset, 0);
-  draw_frame_column (frame, src_height, frame_height - top_offset - bottom_offset, 0, 0, dst, top_offset, left_offset);
-
-  /* draw the bottom right corner and bottom row */
-  gdk_pixbuf_copy_area (frame, frame_width - right_offset, frame_height - bottom_offset, right_offset,
-                        bottom_offset, dst, dst_width - right_offset, dst_height - bottom_offset);
-  draw_frame_row (frame, src_width, frame_width - left_offset - right_offset, frame_height - bottom_offset,
-                  dst_height - bottom_offset, dst, left_offset, bottom_offset);
-
-  /* draw the bottom left corner and the right column */
-  gdk_pixbuf_copy_area (frame, 0, frame_height - bottom_offset, left_offset, bottom_offset, dst, 0, dst_height - bottom_offset);
-  draw_frame_column (frame, src_height, frame_height - top_offset - bottom_offset, frame_width - right_offset,
-                     dst_width - right_offset, dst, top_offset, right_offset);
-
-  /* copy the source pixbuf into the framed area */
-  gdk_pixbuf_copy_area (src, 0, 0, src_width, src_height, dst, left_offset, top_offset);
-
-  return dst;
-}
-
-
-
-
diff --git a/thunar/thunar-gdk-pixbuf-extensions.h b/thunar/thunar-gdk-pixbuf-extensions.h
deleted file mode 100644
index 8d87430c1f37e1c7dbf500a1af466589ae364606..0000000000000000000000000000000000000000
--- a/thunar/thunar-gdk-pixbuf-extensions.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __THUNAR_GDK_PIXBUF_EXTENSIONS_H__
-#define __THUNAR_GDK_PIXBUF_EXTENSIONS_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-G_BEGIN_DECLS;
-
-GdkPixbuf *thunar_gdk_pixbuf_frame     (GdkPixbuf       *src,
-                                        GdkPixbuf       *frame,
-                                        gint             left_offset,
-                                        gint             top_offset,
-                                        gint             right_offset,
-                                        gint             bottom_offset);
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_GDK_PIXBUF_EXTENSIONS_H__ */
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index 720617ccd4bd0fd0db7d62f4c4211d35d4d3a8b8..3262877ea00c3e9a93f2ea95cd1acef86ebfae58 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #endif
 
-#include <thunar/thunar-gdk-pixbuf-extensions.h>
 #include <thunar/thunar-gobject-extensions.h>
 #include <thunar/thunar-icon-factory.h>
 #include <thunar/thunar-preferences.h>
@@ -509,7 +508,7 @@ thunar_icon_factory_load_from_file (ThunarIconFactory *factory,
         {
           /* add a frame to the thumbnail */
           frame = gdk_pixbuf_new_from_inline (-1, thunar_thumbnail_frame, FALSE, NULL);
-          tmp = thunar_gdk_pixbuf_frame (pixbuf, frame, 3, 3, 6, 6);
+          tmp = exo_gdk_pixbuf_frame (pixbuf, frame, 3, 3, 6, 6);
           g_object_unref (G_OBJECT (pixbuf));
           g_object_unref (G_OBJECT (frame));
           pixbuf = tmp;
diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index dcc58fed1c9ec90acf6d6a9a44f1a5c6cd9a67e4..39635ac553312c7dab233152e37f3f8f1ffd2069 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <thunar/thunar-clipboard-manager.h>
-#include <thunar/thunar-gdk-pixbuf-extensions.h>
 #include <thunar/thunar-gobject-extensions.h>
 #include <thunar/thunar-icon-factory.h>
 #include <thunar/thunar-icon-renderer.h>