diff --git a/ChangeLog b/ChangeLog
index efb8846435207e5eb90258e4a9e29871121b0415..c6838a24189edf70ad0a20a1b8d2e3f4393eafd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-07	Benedikt Meurer <benny@xfce.org>
+
+	* plugins/thunar-uca/thunar-uca-editor.c
+	  (thunar_uca_editor_icon_clicked): Use
+	  gtk_file_filter_add_pixbuf_formats().
+	* THANKS: Update translator credits.
+
 2006-05-05	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-location-buttons.c
diff --git a/THANKS b/THANKS
index a42b89e26773f270b69b333e98b481c7f06dcc28..1bdb0659e42471269d58973082c5c148495715e1 100644
--- a/THANKS
+++ b/THANKS
@@ -19,12 +19,21 @@ These people have translated Thunar to foreign languages.
  Pau Rul·lan Ferragut <paurullan@bulma.net>
   * ca translations
 
+ Michal Várady <miko.vaji@gmail.com>
+  * cs translations
+
  Stavros Giannouris <stavrosg2002@freemail.gr>
   * el translations
 
+ Miguel Angel Ruiz Manzano <debianized@gmail.com>
+  * es translations
+
  Pablo Hernández-M. Saiz <homeless3d@gmail.com>
   * es translations
 
+ Peeter Vois <Peeter.Vois@proekspert.ee>
+  * et translations
+
  Piarres Beobide <pi@beobide.net>
   * eu translations
 
@@ -37,6 +46,9 @@ These people have translated Thunar to foreign languages.
  Yo'av Moshe <bjesus@gmail.com>
   * he translations
 
+ Yuval Tanny <tanai@int.gov.il>
+  * he translations
+
  Szervác Attila <sas@321.hu>
   * hu translations
 
@@ -49,21 +61,46 @@ These people have translated Thunar to foreign languages.
  Vincent Tunru <imnotb@gmail.com>
   * nl translations
 
+ Piotr Maliński <admin@rk.edu.pl>
+  * pl translations
+
+ Szymon Kałasz <szymon_maestro@gazeta.pl>
+  * pl translations
+
  Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>
   * pl translations
 
+ Adriano Winter Bess <awbess@gmail.com>
+  * pt_BR translations
+
  Joao Pedrosa <joaopedrosa@gmail.com>
   * pt_BR translations
 
+ Rodrigo Coacci <rcoacci@gmail.com>
+  * pt_BR translations
+
  Andrey Fedoseev <andrey.fedoseev@gmail.com>
   * ru translations
 
+ Sergey Fedoseev <fedoseev.sergey@gmail.com>
+  * ru translations
+
  Daniel Nylander <po@danielnylander.se>
   * sv translations
 
+ Maxim V. Dziumanenko <mvd@mylinux.ua>
+  * uk translations
+
+ kangkang <kanger@gmail.com>
+  * zh_CN translations
+
  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
   * zh_TW translations
 
+ Cosmo Chene <cosmolax@gmail.com>
+  * zh_TW translations
+
+
 
 Other contributors (sorted by name):
 ------------------------------------
diff --git a/plugins/thunar-uca/thunar-uca-editor.c b/plugins/thunar-uca/thunar-uca-editor.c
index 0e904311a392230091b477ba51de56ca63d7be39..17dff4b37f9edfde199f282477d437db6166af3b 100644
--- a/plugins/thunar-uca/thunar-uca-editor.c
+++ b/plugins/thunar-uca/thunar-uca-editor.c
@@ -637,13 +637,7 @@ thunar_uca_editor_icon_clicked (ThunarUcaEditor *uca_editor)
   GtkFileFilter *filter;
   GtkWidget     *chooser;
   GtkWidget     *image;
-  gchar        **extensions;
-  gchar        **mime_types;
   gchar         *filename;
-  gchar         *pattern;
-  GSList        *formats;
-  GSList        *lp;
-  gint           n;
 
   g_return_if_fail (THUNAR_UCA_IS_EDITOR (uca_editor));
 
@@ -663,24 +657,7 @@ thunar_uca_editor_icon_clicked (ThunarUcaEditor *uca_editor)
 
   filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("Image Files"));
-  formats = gdk_pixbuf_get_formats ();
-  for (lp = formats; lp != NULL; lp = lp->next)
-    {
-      extensions = gdk_pixbuf_format_get_extensions (lp->data);
-      for (n = 0; extensions[n] != NULL; ++n)
-        {
-          pattern = g_strconcat ("*.", extensions[n], NULL);
-          gtk_file_filter_add_pattern (filter, pattern);
-          g_free (pattern);
-        }
-      g_strfreev (extensions);
-
-      mime_types = gdk_pixbuf_format_get_mime_types (lp->data);
-      for (n = 0; mime_types[n] != NULL; ++n)
-        gtk_file_filter_add_mime_type (filter, mime_types[n]);
-      g_strfreev (mime_types);
-    }
-  g_slist_free (formats);
+  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);