diff --git a/ChangeLog b/ChangeLog
index 2b01471305a146d32a9f2a4369f50252bd3e4da3..dd823590780b9214f92864239077a82fd7fb7ccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-12	Benedikt Meurer <benny@xfce.org>
+
+	* plugins/thunar-apr/, acinclude.m4, plugins/Makefile.am,
+	  configure.in.in: Import the "Advanced Properties" plugin.
+	* README: Add note about optional pcre and libexif dependencies.
+	* po/POTFILES.in: Add new files.
+	* po/Thunar.pot, po/*.po: Merge new strings.
+	* po/de.po: Update german translations.
+
 2006-04-11	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-deep-count-job.c
diff --git a/README b/README
index 88d871c57d594d64080adab5ad7d7aee5f1f1c26..89d7bbf524fc54054a8ace3e2f421d2ca97a899d 100644
--- a/README
+++ b/README
@@ -24,8 +24,10 @@ Thunar can optionally use the following packages:
  - HAL 0.5.0 or above (esp. the libhal-storage devel package)
  - gamin 0.1.0 or above
  - gconf 2.4 or above
+ - libexif 0.6 or above
  - libjpeg 6 or above
  - libstartup-notification 0.4 or above
+ - pcre 6.0 or above
 
 
 Installation
diff --git a/acinclude.m4 b/acinclude.m4
index 4ded3bc1dfe82e35c82daffceb5eb12ba79e1571..357551add463156567bb01fed5b507b3428f0e09 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -8,6 +8,25 @@ dnl
 
 
 
+dnl # BM_THUNAR_PLUGIN_APR()
+dnl #
+dnl # Check whether the "Advanced Properties" plugin
+dnl # should be built and installed.
+dnl #
+AC_DEFUN([BM_THUNAR_PLUGIN_APR],
+[
+AC_ARG_ENABLE([apr-plugin], [AC_HELP_STRING([--disable-apr-plugin], [Don't build the thunar-apr plugin, see plugins/thunar-apr/README])],
+  [ac_bm_thunar_plugin_apr=$enable_val], [ac_bm_thunar_plugin_apr=yes])
+AC_MSG_CHECKING([whether to build the thunar-apr plugin])
+AM_CONDITIONAL([THUNAR_PLUGIN_APR], [test x"$ac_bm_thunar_plugin_apr" = x"yes"])
+AC_MSG_RESULT([$ac_bm_thunar_plugin_apr])
+
+dnl Check for libexif (for the "Image" properties page)
+XDT_CHECK_OPTIONAL_PACKAGE([EXIF], [libexif], [0.6.0], [exif], [Exif support])
+])
+
+
+
 dnl # BM_THUNAR_PLUGIN_SBR()
 dnl #
 dnl # Check whether the "Simple Builtin Renamers" plugin
diff --git a/configure.in.in b/configure.in.in
index 092373965a11da0738c1994ee9c4a1e4fb6558fe..0a7130a0cc3a18cc3966e23f039b9b08ddcb79e6 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -341,6 +341,7 @@ AC_SUBST([PLATFORM_LDFLAGS])
 dnl ************************************
 dnl *** Check for additional plugins ***
 dnl ************************************
+BM_THUNAR_PLUGIN_APR()
 BM_THUNAR_PLUGIN_SBR()
 BM_THUNAR_PLUGIN_UCA()
 
@@ -370,6 +371,7 @@ icons/48x48/Makefile
 icons/scalable/Makefile
 pixmaps/Makefile
 plugins/Makefile
+plugins/thunar-apr/Makefile
 plugins/thunar-sbr/Makefile
 plugins/thunar-uca/Makefile
 po/Makefile.in
@@ -413,6 +415,7 @@ echo "* Volume Manager:            $ac_bm_thunar_vfs_volume_impl"
 echo
 echo "Additional Plugins:"
 echo
+echo "* Advanced Properties:       $ac_bm_thunar_plugin_apr"
 echo "* Simple Builting Renamers:  $ac_bm_thunar_plugin_sbr"
 echo "* User Customizable Actions: $ac_bm_thunar_plugin_uca"
 echo
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9f23580e30b2bc71e286f9c440ef0cf74b1fbb21..94d5512258d5efa75ad272856ef2dd3d07ed0823 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,5 +1,9 @@
 # $Id$
 
+if THUNAR_PLUGIN_APR
+THUNAR_APR_SUBDIRS = thunar-apr
+endif
+
 if THUNAR_PLUGIN_SBR
 THUNAR_SBR_SUBDIRS = thunar-sbr
 endif
@@ -9,6 +13,7 @@ THUNAR_UCA_SUBDIRS = thunar-uca
 endif
 
 SUBDIRS =								\
+	$(THUNAR_APR_SUBDIRS)						\
 	$(THUNAR_SBR_SUBDIRS)						\
 	$(THUNAR_UCA_SUBDIRS)
 
diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..5150f168041e3ab7ed36710174bfcb0c3121c431
--- /dev/null
+++ b/plugins/thunar-apr/Makefile.am
@@ -0,0 +1,44 @@
+# $Id$
+
+INCLUDES =								\
+	-I$(top_builddir)						\
+	-I$(top_builddir)/plugins					\
+	-I$(top_srcdir)							\
+	-I$(top_srcdir)/plugins						\
+	-DEXO_API_SUBJECT_TO_CHANGE					\
+	-DG_LOG_DOMAIN=\"thunar-apr\"					\
+	$(PLATFORM_CPPFLAGS)
+
+extensionsdir = $(libdir)/thunarx-$(THUNAR_VERSION_API)
+extensions_LTLIBRARIES =						\
+	thunar-apr.la
+
+thunar_apr_la_SOURCES =							\
+	thunar-apr-abstract-page.c					\
+	thunar-apr-abstract-page.h					\
+	thunar-apr-desktop-page.c					\
+	thunar-apr-desktop-page.h					\
+	thunar-apr-image-page.c						\
+	thunar-apr-image-page.h						\
+	thunar-apr-plugin.c						\
+	thunar-apr-provider.c						\
+	thunar-apr-provider.h
+
+thunar_apr_la_CFLAGS =							\
+	$(EXIF_CFLAGS)							\
+	$(EXO_CFLAGS)							\
+	$(PLATFORM_CFLAGS)
+
+thunar_apr_la_LDFLAGS =							\
+	-avoid-version							\
+	-export-dynamic							\
+	-module								\
+	$(PLATFORM_LDFLAGS)
+
+thunar_apr_la_LIBADD =							\
+	$(EXIF_LIBS)
+
+EXTRA_DIST =								\
+	README
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/thunar-apr/README b/plugins/thunar-apr/README
new file mode 100644
index 0000000000000000000000000000000000000000..3d627b2b0f1e2d00e53db64498681731dd662ddc
--- /dev/null
+++ b/plugins/thunar-apr/README
@@ -0,0 +1,29 @@
+Thunar Advanced Properties (thunar-apr)
+=======================================
+
+Thunar-apr is an extension to Thunar, which provides additional pages for
+the file properties dialog, that are displayed for certain kinds of files:
+
+ * Launcher/Link
+ * Image
+
+The Launcher/Link page is displayed for .desktop files and allows users to
+easily edit the most important values (i.e. the command for a launcher and
+the URL for a link).
+
+The Image page is displayed for all kinds of image files supported by the
+GTK+ version used by Thunar. The page displays atleast the exact format of
+the image and the dimensions in pixels. If the plugin is build with support
+for libexif (you can explicitly disable this using the `--disable-exif'
+configure option) and the image file includes Exif tags, the most important
+Exif tags found in the image file will also be displayed.
+
+By default the thunar-apr extension will be installed, but as with every
+extension, it will slightly increase the resource usage of Thunar (this
+shouldn't be a real problem unless you're targeting an embedded system),
+and so you can pass `--disable-apr-plugin' to configure and the plugin
+won't be built and installed. Since it is an extension, you can also
+easily uninstall it afterwards by removing the thunar-apr.so file from
+the lib/thunarx-1/ directory of your installation (be sure to quit Thunar
+before removing files though).
+
diff --git a/plugins/thunar-apr/thunar-apr-abstract-page.c b/plugins/thunar-apr/thunar-apr-abstract-page.c
new file mode 100644
index 0000000000000000000000000000000000000000..49922038ebaee645f7d08be7604ac12f5b39adde
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-abstract-page.c
@@ -0,0 +1,254 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-apr/thunar-apr-abstract-page.h>
+
+
+
+/* Property identifiers */
+enum
+{
+  PROP_0,
+  PROP_FILE,
+};
+
+/* Signal identifiers */
+enum
+{
+  FILE_CHANGED,
+  LAST_SIGNAL,
+};
+
+
+
+static void thunar_apr_abstract_page_class_init   (ThunarAprAbstractPageClass *klass);
+static void thunar_apr_abstract_page_init         (ThunarAprAbstractPage      *abstract_page);
+static void thunar_apr_abstract_page_dispose      (GObject                    *object);
+static void thunar_apr_abstract_page_get_property (GObject                    *object,
+                                                   guint                       prop_id,
+                                                   GValue                     *value,
+                                                   GParamSpec                 *pspec);
+static void thunar_apr_abstract_page_set_property (GObject                    *object,
+                                                   guint                       prop_id,
+                                                   const GValue               *value,
+                                                   GParamSpec                 *pspec);
+static void thunar_apr_abstract_page_file_changed (ThunarAprAbstractPage      *abstract_page,
+                                                   ThunarxFileInfo            *file);
+
+
+
+static guint abstract_page_signals[LAST_SIGNAL];
+
+
+
+THUNARX_DEFINE_ABSTRACT_TYPE (ThunarAprAbstractPage,
+                              thunar_apr_abstract_page,
+                              THUNARX_TYPE_PROPERTY_PAGE);
+
+
+
+static void
+thunar_apr_abstract_page_class_init (ThunarAprAbstractPageClass *klass)
+{
+  GObjectClass *gobject_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->dispose = thunar_apr_abstract_page_dispose;
+  gobject_class->get_property = thunar_apr_abstract_page_get_property;
+  gobject_class->set_property = thunar_apr_abstract_page_set_property;
+
+  /**
+   * ThunarAprAbstractPage:file:
+   *
+   * The #ThunarxFileInfo for the file being displayed by
+   * this property page.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_FILE,
+                                   g_param_spec_object ("file", "file", "file",
+                                                        THUNARX_TYPE_FILE_INFO,
+                                                        G_PARAM_READWRITE));
+
+  /**
+   * ThunarAprAbstractPage::file-changed:
+   * @abstract_page : a #ThunarAprAbstractPage.
+   * @file          : a #ThunarxFileInfo.
+   *
+   * Emitted by @abstract_page whenever the associated
+   * @file changes.
+   **/
+  abstract_page_signals[FILE_CHANGED] =
+    g_signal_new ("file-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (ThunarAprAbstractPageClass, file_changed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1,
+                  THUNARX_TYPE_FILE_INFO);
+}
+
+
+
+static void
+thunar_apr_abstract_page_init (ThunarAprAbstractPage *abstract_page)
+{
+}
+
+
+
+static void
+thunar_apr_abstract_page_dispose (GObject *object)
+{
+  ThunarAprAbstractPage *abstract_page = THUNAR_APR_ABSTRACT_PAGE (object);
+
+  /* disconnect from the file */
+  thunar_apr_abstract_page_set_file (abstract_page, NULL);
+
+  (*G_OBJECT_CLASS (thunar_apr_abstract_page_parent_class)->dispose) (object);
+}
+
+
+
+static void
+thunar_apr_abstract_page_get_property (GObject    *object,
+                                       guint       prop_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  ThunarAprAbstractPage *abstract_page = THUNAR_APR_ABSTRACT_PAGE (object);
+
+  switch (prop_id)
+    {
+    case PROP_FILE:
+      g_value_set_object (value, thunar_apr_abstract_page_get_file (abstract_page));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+
+static void
+thunar_apr_abstract_page_set_property (GObject      *object,
+                                       guint         prop_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  ThunarAprAbstractPage *abstract_page = THUNAR_APR_ABSTRACT_PAGE (object);
+
+  switch (prop_id)
+    {
+    case PROP_FILE:
+      thunar_apr_abstract_page_set_file (abstract_page, g_value_get_object (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+
+static void
+thunar_apr_abstract_page_file_changed (ThunarAprAbstractPage *abstract_page,
+                                       ThunarxFileInfo       *file)
+{
+  /* emit the "file-changed" signal */
+  g_signal_emit (G_OBJECT (abstract_page), abstract_page_signals[FILE_CHANGED], 0, file);
+}
+
+
+
+/**
+ * thunar_apr_abstract_page_get_file:
+ * @abstract_page : a #ThunarAprAbstractPage.
+ *
+ * Returns the #ThunarxFileInfo for the file being
+ * displayed by the @abstract_page.
+ *
+ * Return value: the file for @abstract_page.
+ **/
+ThunarxFileInfo*
+thunar_apr_abstract_page_get_file (ThunarAprAbstractPage *abstract_page)
+{
+  g_return_val_if_fail (THUNAR_APR_IS_ABSTRACT_PAGE (abstract_page), NULL);
+  return abstract_page->file;
+}
+
+
+
+/**
+ * thunar_apr_abstract_page_set_file:
+ * @abstract_page : a #ThunarAprAbstractPage.
+ * @file          : a #ThunarxFileInfo or %NULL.
+ *
+ * Sets the #ThunarxFileInfo being displayed by the
+ * @abstract_page to @file. If @file is %NULL, the
+ * property will be reset.
+ **/
+void
+thunar_apr_abstract_page_set_file (ThunarAprAbstractPage *abstract_page,
+                                   ThunarxFileInfo       *file)
+{
+  g_return_if_fail (THUNAR_APR_IS_ABSTRACT_PAGE (abstract_page));
+  g_return_if_fail (file == NULL || THUNARX_IS_FILE_INFO (file));
+
+  /* verify that we don't already display that file */
+  if (G_UNLIKELY (abstract_page->file == file))
+    return;
+
+  /* disconnect from the previous file */
+  if (G_UNLIKELY (abstract_page->file != NULL))
+    {
+      g_signal_handlers_disconnect_by_func (G_OBJECT (abstract_page->file), thunar_apr_abstract_page_file_changed, abstract_page);
+      g_object_unref (G_OBJECT (abstract_page->file));
+    }
+
+  /* activate the new file */
+  abstract_page->file = file;
+
+  /* connect to the new file */
+  if (G_LIKELY (file != NULL))
+    {
+      /* connect "changed" signal and take a reference */
+      g_signal_connect_swapped (G_OBJECT (file), "changed", G_CALLBACK (thunar_apr_abstract_page_file_changed), abstract_page);
+      g_object_ref (G_OBJECT (file));
+
+      /* update the initial state */
+      thunar_apr_abstract_page_file_changed (abstract_page, file);
+    }
+
+  /* notify listeners */
+  g_object_notify (G_OBJECT (abstract_page), "file");
+}
+
+
+
+
+
diff --git a/plugins/thunar-apr/thunar-apr-abstract-page.h b/plugins/thunar-apr/thunar-apr-abstract-page.h
new file mode 100644
index 0000000000000000000000000000000000000000..bc3edb6bd951dc360fd59b6a4e840f8ef876d928
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-abstract-page.h
@@ -0,0 +1,62 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __THUNAR_APR_ABSTRACT_PAGE_H__
+#define __THUNAR_APR_ABSTRACT_PAGE_H__
+
+#include <thunarx/thunarx.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarAprAbstractPageClass ThunarAprAbstractPageClass;
+typedef struct _ThunarAprAbstractPage      ThunarAprAbstractPage;
+
+#define THUNAR_APR_TYPE_ABSTRACT_PAGE            (thunar_apr_abstract_page_get_type ())
+#define THUNAR_APR_ABSTRACT_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_APR_TYPE_ABSTRACT_PAGE, ThunarAprAbstractPage))
+#define THUNAR_APR_ABSTRACT_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_APR_TYPE_ABSTRACT_PAGE, ThunarAprAbstractPageClass))
+#define THUNAR_APR_IS_ABSTRACT_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_APR_TYPE_ABSTRACT_PAGE))
+#define THUNAR_APR_IS_ABSTRACT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_APR_TYPE_ABSTRACT_PAGE))
+#define THUNAR_APR_ABSTRACT_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_APR_TYPE_ABSTRACT_PAGE, ThunarAprAbstractPageClass))
+
+struct _ThunarAprAbstractPageClass
+{
+  ThunarxPropertyPageClass __parent__;
+
+  /* signals */
+  void (*file_changed) (ThunarAprAbstractPage *abstract_page,
+                        ThunarxFileInfo       *file);
+};
+
+struct _ThunarAprAbstractPage
+{
+  ThunarxPropertyPage __parent__;
+  ThunarxFileInfo    *file;
+};
+
+GType            thunar_apr_abstract_page_get_type      (void) G_GNUC_CONST G_GNUC_INTERNAL;
+void             thunar_apr_abstract_page_register_type (ThunarxProviderPlugin *plugin) G_GNUC_INTERNAL;
+
+ThunarxFileInfo *thunar_apr_abstract_page_get_file      (ThunarAprAbstractPage *abstract_page) G_GNUC_INTERNAL;
+void             thunar_apr_abstract_page_set_file      (ThunarAprAbstractPage *abstract_page,
+                                                         ThunarxFileInfo       *file) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_APR_ABSTRACT_PAGE_H__ */
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c b/plugins/thunar-apr/thunar-apr-desktop-page.c
new file mode 100644
index 0000000000000000000000000000000000000000..2eb4652473efd3a812bea13cf81aa3edff7a4f37
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -0,0 +1,702 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <exo/exo.h>
+
+#include <thunar-apr/thunar-apr-desktop-page.h>
+
+/* use g_access() if available */
+#if GLIB_CHECK_VERSION(2,8,0)
+#include <glib/gstdio.h>
+#else
+#define g_access(filename, mode) (access ((filename), (mode)))
+#endif
+
+
+
+static void     thunar_apr_desktop_page_class_init      (ThunarAprDesktopPageClass  *klass);
+static void     thunar_apr_desktop_page_init            (ThunarAprDesktopPage       *desktop_page);
+static void     thunar_apr_desktop_page_finalize        (GObject                    *object);
+static void     thunar_apr_desktop_page_file_changed    (ThunarAprAbstractPage      *abstract_page,
+                                                         ThunarxFileInfo            *file);
+static void     thunar_apr_desktop_page_save            (ThunarAprDesktopPage       *desktop_page,
+                                                         GtkWidget                  *widget);
+static void     thunar_apr_desktop_page_save_widget     (ThunarAprDesktopPage       *desktop_page,
+                                                         GtkWidget                  *widget,
+                                                         GKeyFile                   *key_file);
+static void     thunar_apr_desktop_page_activated       (GtkWidget                  *entry,
+                                                         ThunarAprDesktopPage       *desktop_page);
+static gboolean thunar_apr_desktop_page_focus_out_event (GtkWidget                  *entry,
+                                                         GdkEventFocus              *event,
+                                                         ThunarAprDesktopPage       *desktop_page);
+static void     thunar_apr_desktop_page_toggled         (GtkWidget                  *button,
+                                                         ThunarAprDesktopPage       *desktop_page);
+
+
+
+struct _ThunarAprDesktopPageClass
+{
+  ThunarAprAbstractPageClass __parent__;
+};
+
+struct _ThunarAprDesktopPage
+{
+  ThunarAprAbstractPage __parent__;
+  
+  GtkTooltips          *tooltips;
+
+  GtkWidget            *description_entry;
+  GtkWidget            *command_entry;
+  GtkWidget            *url_entry;
+  GtkWidget            *comment_entry;
+  GtkWidget            *snotify_button;
+  GtkWidget            *terminal_button;
+
+  /* the values of the entries remember when
+   * the file was saved last time to avoid a
+   * race condition between saving the file
+   * and the FAM notification which is received
+   * with some delay and would otherwise over-
+   * ride the (possibly changed) values of the
+   * entries.
+   */
+  gchar                *description_text;
+  gchar                *command_text;
+  gchar                *url_text;
+  gchar                *comment_text;
+};
+
+
+
+THUNARX_DEFINE_TYPE (ThunarAprDesktopPage,
+                     thunar_apr_desktop_page,
+                     THUNAR_APR_TYPE_ABSTRACT_PAGE);
+
+
+
+static void
+thunar_apr_desktop_page_class_init (ThunarAprDesktopPageClass *klass)
+{
+  ThunarAprAbstractPageClass *thunarapr_abstract_page_class;
+  GObjectClass               *gobject_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = thunar_apr_desktop_page_finalize;
+
+  thunarapr_abstract_page_class = THUNAR_APR_ABSTRACT_PAGE_CLASS (klass);
+  thunarapr_abstract_page_class->file_changed = thunar_apr_desktop_page_file_changed;
+}
+
+
+
+
+static void
+thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
+{
+  AtkRelationSet *relations;
+  PangoAttribute *attribute;
+  PangoAttrList  *attr_list;
+  AtkRelation    *relation;
+  AtkObject      *object;
+  GtkWidget      *table;
+  GtkWidget      *label;
+
+  gtk_container_set_border_width (GTK_CONTAINER (desktop_page), 12);
+
+  /* allocate the shared tooltips */
+  desktop_page->tooltips = gtk_tooltips_new ();
+  exo_gtk_object_ref_sink (GTK_OBJECT (desktop_page->tooltips));
+
+  /* allocate shared bold Pango attributes */
+  attr_list = pango_attr_list_new ();
+  attribute = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
+  attribute->start_index = 0;
+  attribute->end_index = -1;
+  pango_attr_list_insert (attr_list, attribute);
+
+  table = gtk_table_new (7, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 0);
+  gtk_container_add (GTK_CONTAINER (desktop_page), table);
+  gtk_widget_show (table);
+
+  label = gtk_label_new (_("Description:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (label);
+
+  desktop_page->description_entry = gtk_entry_new ();
+  gtk_tooltips_set_tip (desktop_page->tooltips, desktop_page->description_entry, _("The generic name of the entry, for example \"Web Browser\" "
+                                                                                   "in case of Firefox."), NULL);
+  g_signal_connect (G_OBJECT (desktop_page->description_entry), "activate", G_CALLBACK (thunar_apr_desktop_page_activated), desktop_page);
+  g_signal_connect (G_OBJECT (desktop_page->description_entry), "focus-out-event", G_CALLBACK (thunar_apr_desktop_page_focus_out_event), desktop_page);
+  gtk_table_attach (GTK_TABLE (table), desktop_page->description_entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (desktop_page->description_entry);
+
+  exo_binding_new (G_OBJECT (desktop_page->description_entry), "visible", G_OBJECT (label), "visible");
+
+  /* set Atk label relation for the entry */
+  object = gtk_widget_get_accessible (desktop_page->description_entry);
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+  label = gtk_label_new (_("Command:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (label);
+
+  desktop_page->command_entry = gtk_entry_new ();
+  gtk_tooltips_set_tip (desktop_page->tooltips, desktop_page->command_entry, _("The program to execute, possibly with arguments."), NULL);
+  g_signal_connect (G_OBJECT (desktop_page->command_entry), "activate", G_CALLBACK (thunar_apr_desktop_page_activated), desktop_page);
+  g_signal_connect (G_OBJECT (desktop_page->command_entry), "focus-out-event", G_CALLBACK (thunar_apr_desktop_page_focus_out_event), desktop_page);
+  gtk_table_attach (GTK_TABLE (table), desktop_page->command_entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (desktop_page->command_entry);
+
+  exo_binding_new (G_OBJECT (desktop_page->command_entry), "visible", G_OBJECT (label), "visible");
+
+  /* set Atk label relation for the entry */
+  object = gtk_widget_get_accessible (desktop_page->command_entry);
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+  label = gtk_label_new (_("URL:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (label);
+
+  desktop_page->url_entry = gtk_entry_new ();
+  gtk_tooltips_set_tip (desktop_page->tooltips, desktop_page->url_entry, _("The URL to access."), NULL);
+  g_signal_connect (G_OBJECT (desktop_page->url_entry), "activate", G_CALLBACK (thunar_apr_desktop_page_activated), desktop_page);
+  g_signal_connect (G_OBJECT (desktop_page->url_entry), "focus-out-event", G_CALLBACK (thunar_apr_desktop_page_focus_out_event), desktop_page);
+  gtk_table_attach (GTK_TABLE (table), desktop_page->url_entry, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (desktop_page->url_entry);
+
+  exo_binding_new (G_OBJECT (desktop_page->url_entry), "visible", G_OBJECT (label), "visible");
+
+  /* set Atk label relation for the entry */
+  object = gtk_widget_get_accessible (desktop_page->url_entry);
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+  label = gtk_label_new (_("Comment:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (label);
+
+  desktop_page->comment_entry = gtk_entry_new ();
+  gtk_tooltips_set_tip (desktop_page->tooltips, desktop_page->comment_entry, _("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."), NULL);
+  g_signal_connect (G_OBJECT (desktop_page->comment_entry), "activate", G_CALLBACK (thunar_apr_desktop_page_activated), desktop_page);
+  g_signal_connect (G_OBJECT (desktop_page->comment_entry), "focus-out-event", G_CALLBACK (thunar_apr_desktop_page_focus_out_event), desktop_page);
+  gtk_table_attach (GTK_TABLE (table), desktop_page->comment_entry, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (desktop_page->comment_entry);
+
+  exo_binding_new (G_OBJECT (desktop_page->comment_entry), "visible", G_OBJECT (label), "visible");
+
+  /* set Atk label relation for the entry */
+  object = gtk_widget_get_accessible (desktop_page->comment_entry);
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+  /* add spacing between the entries and the options */
+  gtk_table_set_row_spacing (GTK_TABLE (table), 4, 24);
+
+  label = gtk_label_new (_("Options:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6, GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (label);
+
+  desktop_page->snotify_button = gtk_check_button_new_with_mnemonic (_("Use _startup notification"));
+  gtk_tooltips_set_tip (desktop_page->tooltips, desktop_page->snotify_button, _("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."), NULL);
+  g_signal_connect (G_OBJECT (desktop_page->snotify_button), "toggled", G_CALLBACK (thunar_apr_desktop_page_toggled), desktop_page);
+  gtk_table_attach (GTK_TABLE (table), desktop_page->snotify_button, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (desktop_page->snotify_button);
+
+  desktop_page->terminal_button = gtk_check_button_new_with_mnemonic (_("Run in _terminal"));
+  gtk_tooltips_set_tip (desktop_page->tooltips, desktop_page->terminal_button, _("Select this option to run the command in a terminal window."), NULL);
+  g_signal_connect (G_OBJECT (desktop_page->terminal_button), "toggled", G_CALLBACK (thunar_apr_desktop_page_toggled), desktop_page);
+  gtk_table_attach (GTK_TABLE (table), desktop_page->terminal_button, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (desktop_page->terminal_button);
+
+  /* set Atk label relation for the buttons */
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  object = gtk_widget_get_accessible (desktop_page->snotify_button);
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+  object = gtk_widget_get_accessible (desktop_page->terminal_button);
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+  exo_binding_new (G_OBJECT (desktop_page->snotify_button), "visible", G_OBJECT (label), "visible");
+
+  /* release shared bold Pango attributes */
+  pango_attr_list_unref (attr_list);
+}
+
+
+
+static void
+thunar_apr_desktop_page_finalize (GObject *object)
+{
+  ThunarAprDesktopPage *desktop_page = THUNAR_APR_DESKTOP_PAGE (object);
+
+  /* release the shared tooltips */
+  g_object_unref (G_OBJECT (desktop_page->tooltips));
+
+  /* release the saved texts */
+  g_free (desktop_page->description_text);
+  g_free (desktop_page->command_text);
+  g_free (desktop_page->url_text);
+  g_free (desktop_page->comment_text);
+
+  (*G_OBJECT_CLASS (thunar_apr_desktop_page_parent_class)->finalize) (object);
+}
+
+
+
+static void
+thunar_apr_desktop_page_file_changed (ThunarAprAbstractPage *abstract_page,
+                                      ThunarxFileInfo       *file)
+{
+  ThunarAprDesktopPage *desktop_page = THUNAR_APR_DESKTOP_PAGE (abstract_page);
+  GKeyFile             *key_file;
+  gboolean              writable;
+  gboolean              enabled;
+  GError               *error = NULL;
+  gchar                *filename;
+  gchar                *value;
+  gchar                *type;
+  gchar                *uri;
+
+  /* allocate the key file memory */
+  key_file = g_key_file_new ();
+
+  /* determine the local path to the file */
+  uri = thunarx_file_info_get_uri (file);
+  filename = g_filename_from_uri (uri, NULL, NULL);
+  g_free (uri);
+
+  /* try to load the file contents */
+  if (filename != NULL && g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, NULL))
+    {
+      /* determine the type of the .desktop file (default to "Application") */
+      type = g_key_file_get_string (key_file, "Desktop Entry", "Type", NULL);
+      if (G_UNLIKELY (type == NULL))
+        type = g_strdup ("Application");
+
+      /* change page title depending on the type */
+      if (strcmp (type, "Application") == 0)
+        thunarx_property_page_set_label (THUNARX_PROPERTY_PAGE (desktop_page), _("Launcher"));
+      else if (strcmp (type, "Link") == 0)
+        thunarx_property_page_set_label (THUNARX_PROPERTY_PAGE (desktop_page), _("Link"));
+      else
+        thunarx_property_page_set_label (THUNARX_PROPERTY_PAGE (desktop_page), type);
+
+      /* update the "Description" entry */
+      value = g_key_file_get_locale_string (key_file, "Desktop Entry", "GenericName", NULL, NULL);
+      if (!exo_str_is_equal (value, desktop_page->description_text))
+        {
+          /* update the entry */
+          gtk_entry_set_text (GTK_ENTRY (desktop_page->description_entry), (value != NULL) ? value : "");
+
+          /* update the saved value */
+          g_free (desktop_page->description_text);
+          desktop_page->description_text = value;
+        }
+      else
+        {
+          g_free (value);
+        }
+
+      /* update the "Comment" entry */
+      value = g_key_file_get_locale_string (key_file, "Desktop Entry", "Comment", NULL, NULL);
+      if (!exo_str_is_equal (value, desktop_page->comment_text))
+        {
+          /* update the entry */
+          gtk_entry_set_text (GTK_ENTRY (desktop_page->comment_entry), (value != NULL) ? value : "");
+
+          /* update the saved value */
+          g_free (desktop_page->comment_text);
+          desktop_page->comment_text = value;
+        }
+      else
+        {
+          g_free (value);
+        }
+
+      /* update the type dependant entries */
+      if (strcmp (type, "Application") == 0)
+        {
+          /* update the "Command" entry */
+          value = g_key_file_get_string (key_file, "Desktop Entry", "Exec", NULL);
+          if (!exo_str_is_equal (value, desktop_page->command_text))
+            {
+              /* update the entry */
+              gtk_entry_set_text (GTK_ENTRY (desktop_page->command_entry), (value != NULL) ? value : "");
+
+              /* update the saved value */
+              g_free (desktop_page->command_text);
+              desktop_page->command_text = value;
+            }
+          else
+            {
+              g_free (value);
+            }
+
+          /* update the "Use startup notification" button */
+          enabled = g_key_file_get_boolean (key_file, "Desktop Entry", "StartupNotify", &error);
+          g_signal_handlers_block_by_func (G_OBJECT (desktop_page->snotify_button), thunar_apr_desktop_page_toggled, desktop_page);
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (desktop_page->snotify_button), (error == NULL && enabled));
+          g_signal_handlers_unblock_by_func (G_OBJECT (desktop_page->snotify_button), thunar_apr_desktop_page_toggled, desktop_page);
+          g_clear_error (&error);
+
+          /* update the "Run in terminal" button */
+          enabled = g_key_file_get_boolean (key_file, "Desktop Entry", "Terminal", &error);
+          g_signal_handlers_block_by_func (G_OBJECT (desktop_page->terminal_button), thunar_apr_desktop_page_toggled, desktop_page);
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (desktop_page->terminal_button), (error == NULL && enabled));
+          g_signal_handlers_unblock_by_func (G_OBJECT (desktop_page->terminal_button), thunar_apr_desktop_page_toggled, desktop_page);
+          g_clear_error (&error);
+
+          /* update visibility of the specific widgets */
+          gtk_widget_show (desktop_page->command_entry);
+          gtk_widget_hide (desktop_page->url_entry);
+          gtk_widget_show (desktop_page->snotify_button);
+          gtk_widget_show (desktop_page->terminal_button);
+        }
+      else if (strcmp (type, "Link") == 0)
+        {
+          /* update the "URL" entry */
+          value = g_key_file_get_string (key_file, "Desktop Entry", "URL", NULL);
+          if (!exo_str_is_equal (value, desktop_page->url_text))
+            {
+              /* update the entry */
+              gtk_entry_set_text (GTK_ENTRY (desktop_page->url_entry), (value != NULL) ? value : "");
+
+              /* update the saved value */
+              g_free (desktop_page->url_text);
+              desktop_page->url_text = value;
+            }
+          else
+            {
+              g_free (value);
+            }
+
+          /* update visibility of the specific widgets */
+          gtk_widget_hide (desktop_page->command_entry);
+          gtk_widget_show (desktop_page->url_entry);
+          gtk_widget_hide (desktop_page->snotify_button);
+          gtk_widget_hide (desktop_page->terminal_button);
+        }
+      else
+        {
+          /* hide the specific widgets */
+          gtk_widget_hide (desktop_page->command_entry);
+          gtk_widget_hide (desktop_page->url_entry);
+          gtk_widget_hide (desktop_page->snotify_button);
+          gtk_widget_hide (desktop_page->terminal_button);
+        }
+
+      /* check if the file is writable... */
+      writable = (g_access (filename, W_OK) == 0);
+
+      /* ...and update the editability of the entries */
+      gtk_entry_set_editable (GTK_ENTRY (desktop_page->description_entry), writable);
+      gtk_entry_set_editable (GTK_ENTRY (desktop_page->command_entry), writable);
+      gtk_entry_set_editable (GTK_ENTRY (desktop_page->url_entry), writable);
+      gtk_entry_set_editable (GTK_ENTRY (desktop_page->comment_entry), writable);
+      gtk_widget_set_sensitive (desktop_page->snotify_button, writable);
+      gtk_widget_set_sensitive (desktop_page->terminal_button, writable);
+
+      /* cleanup */
+      g_free (type);
+    }
+  else
+    {
+      /* reset page title */
+      thunarx_property_page_set_label (THUNARX_PROPERTY_PAGE (desktop_page), _("Unknown"));
+
+      /* hide all widgets */
+      gtk_widget_hide (desktop_page->description_entry);
+      gtk_widget_hide (desktop_page->command_entry);
+      gtk_widget_hide (desktop_page->url_entry);
+      gtk_widget_hide (desktop_page->comment_entry);
+      gtk_widget_hide (desktop_page->snotify_button);
+      gtk_widget_hide (desktop_page->terminal_button);
+    }
+
+  /* cleanup */
+  g_key_file_free (key_file);
+  g_free (filename);
+}
+
+
+
+static void
+thunar_apr_desktop_page_save (ThunarAprDesktopPage *desktop_page,
+                              GtkWidget            *widget)
+{
+  GtkWidget *toplevel;
+  GtkWidget *message;
+  GKeyFile  *key_file;
+  GError    *error = NULL;
+  gchar     *filename;
+  gchar     *data;
+  gchar     *uri;
+  gsize      data_length;
+#if !GLIB_CHECK_VERSION(2,8,0)
+  FILE      *fp;
+#endif
+
+  /* verify that we still have a valid file */
+  if (THUNAR_APR_ABSTRACT_PAGE (desktop_page)->file == NULL)
+    return;
+
+  /* determine the local path to the file */
+  uri = thunarx_file_info_get_uri (THUNAR_APR_ABSTRACT_PAGE (desktop_page)->file);
+  filename = g_filename_from_uri (uri, NULL, NULL);
+  g_free (uri);
+
+  /* verify that we have a valid local path */
+  if (G_UNLIKELY (filename == NULL))
+    return;
+
+  /* allocate the key file resources */
+  key_file = g_key_file_new ();
+
+  /* try to parse the key file */
+  if (g_key_file_load_from_file (key_file, filename, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, &error))
+    {
+      /* save the widget changes to the key file */
+      thunar_apr_desktop_page_save_widget (desktop_page, widget, key_file);
+
+      /* determine the content of the key file */
+      data = g_key_file_to_data (key_file, &data_length, &error);
+      if (G_LIKELY (data != NULL))
+        {
+          /* try to save the key file content to disk */
+#if GLIB_CHECK_VERSION(2,8,0)
+          g_file_set_contents (filename, data, data_length, &error);
+#else
+          fp = fopen (src_path, "w");
+          if (G_LIKELY (fp != NULL))
+            {
+              fwrite (data, data_length, 1, fp);
+              fclose (fp);
+            }
+          else
+            {
+              error = g_error_new_literal (G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
+            }
+#endif
+
+          /* cleanup */
+          g_free (data);
+        }
+    }
+
+  /* check if we succeed */
+  if (G_UNLIKELY (error != NULL))
+    {
+      /* display an error dialog to the user */
+      toplevel = gtk_widget_get_toplevel (GTK_WIDGET (desktop_page));
+      message = gtk_message_dialog_new ((GtkWindow *) toplevel,
+                                        GTK_DIALOG_DESTROY_WITH_PARENT
+                                        | GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_ERROR,
+                                        GTK_BUTTONS_CLOSE,
+                                        _("Failed to save \"%s\"."), filename);
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s.", error->message);
+      gtk_dialog_run (GTK_DIALOG (message));
+      gtk_widget_destroy (message);
+      g_error_free (error);
+    }
+
+  /* cleanup */
+  g_key_file_free (key_file);
+  g_free (filename);
+}
+
+
+
+static void
+thunar_apr_desktop_page_save_widget (ThunarAprDesktopPage *desktop_page,
+                                     GtkWidget            *widget,
+                                     GKeyFile             *key_file)
+{
+  const gchar * const *locale;
+  gchar               *key;
+
+  if (widget == desktop_page->description_entry)
+    {
+      /* update the saved description text */
+      g_free (desktop_page->description_text);
+      desktop_page->description_text = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
+
+      /* save the new description (localized if required) */
+      for (locale = g_get_language_names (); *locale != NULL; ++locale)
+        {
+          key = g_strdup_printf ("GenericName[%s]", *locale);
+          if (g_key_file_has_key (key_file, "Desktop Entry", key, NULL))
+            {
+              g_key_file_set_string (key_file, "Desktop Entry", key, desktop_page->description_text);
+              g_free (key);
+              break;
+            }
+          g_free (key);
+        }
+
+      /* fallback to unlocalized description */
+      if (G_UNLIKELY (*locale == NULL))
+        g_key_file_set_string (key_file, "Desktop Entry", "GenericName", desktop_page->description_text);
+    }
+  else if (widget == desktop_page->command_entry)
+    {
+      /* update the saved command */
+      g_free (desktop_page->command_text);
+      desktop_page->command_text = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
+
+      /* save the unlocalized command */
+      g_key_file_set_string (key_file, "Desktop Entry", "Exec", desktop_page->command_text);
+    }
+  else if (widget == desktop_page->url_entry)
+    {
+      /* update the saved URL */
+      g_free (desktop_page->url_text);
+      desktop_page->url_text = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
+
+      /* save the unlocalized url */
+      g_key_file_set_string (key_file, "Desktop Entry", "URL", desktop_page->url_text);
+    }
+  else if (widget == desktop_page->comment_entry)
+    {
+      /* update the saved comment text */
+      g_free (desktop_page->comment_text);
+      desktop_page->comment_text = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
+
+      /* save the new comment (localized if required) */
+      for (locale = g_get_language_names (); *locale != NULL; ++locale)
+        {
+          key = g_strdup_printf ("Comment[%s]", *locale);
+          if (g_key_file_has_key (key_file, "Desktop Entry", key, NULL))
+            {
+              g_key_file_set_string (key_file, "Desktop Entry", key, desktop_page->comment_text);
+              g_free (key);
+              break;
+            }
+          g_free (key);
+        }
+
+      /* fallback to unlocalized comment */
+      if (G_UNLIKELY (*locale == NULL))
+        g_key_file_set_string (key_file, "Desktop Entry", "Comment", desktop_page->comment_text);
+    }
+  else if (widget == desktop_page->snotify_button)
+    {
+      g_key_file_set_boolean (key_file, "Desktop Entry", "StartupNotify", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
+    }
+  else if (widget == desktop_page->terminal_button)
+    {
+      g_key_file_set_boolean (key_file, "Desktop Entry", "Terminal", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
+    }
+  else
+    {
+      g_assert_not_reached ();
+    }
+}
+
+
+
+static void
+thunar_apr_desktop_page_activated (GtkWidget            *entry,
+                                   ThunarAprDesktopPage *desktop_page)
+{
+  g_return_if_fail (GTK_IS_ENTRY (entry));
+  g_return_if_fail (THUNAR_APR_IS_DESKTOP_PAGE (desktop_page));
+
+  /* check if the entry is editable, and if so, save the file */
+  if (gtk_editable_get_editable (GTK_EDITABLE (entry)))
+    thunar_apr_desktop_page_save (desktop_page, entry);
+}
+
+
+
+static gboolean
+thunar_apr_desktop_page_focus_out_event (GtkWidget            *entry,
+                                         GdkEventFocus        *event,
+                                         ThunarAprDesktopPage *desktop_page)
+{
+  g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE);
+  g_return_val_if_fail (THUNAR_APR_IS_DESKTOP_PAGE (desktop_page), FALSE);
+
+  /* check if the entry is editable, and if so, save the file */
+  if (gtk_editable_get_editable (GTK_EDITABLE (entry)))
+    thunar_apr_desktop_page_save (desktop_page, entry);
+  return FALSE;
+}
+
+
+
+static void
+thunar_apr_desktop_page_toggled (GtkWidget            *button,
+                                 ThunarAprDesktopPage *desktop_page)
+{
+  g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
+  g_return_if_fail (THUNAR_APR_IS_DESKTOP_PAGE (desktop_page));
+
+  /* save the file */
+  thunar_apr_desktop_page_save (desktop_page, button);
+}
+
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.h b/plugins/thunar-apr/thunar-apr-desktop-page.h
new file mode 100644
index 0000000000000000000000000000000000000000..eec2062bec5b4de32af28bf86c86c53e6a687a40
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.h
@@ -0,0 +1,43 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __THUNAR_APR_DESKTOP_PAGE_H__
+#define __THUNAR_APR_DESKTOP_PAGE_H__
+
+#include <thunar-apr/thunar-apr-abstract-page.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarAprDesktopPageClass ThunarAprDesktopPageClass;
+typedef struct _ThunarAprDesktopPage      ThunarAprDesktopPage;
+
+#define THUNAR_APR_TYPE_DESKTOP_PAGE            (thunar_apr_desktop_page_get_type ())
+#define THUNAR_APR_DESKTOP_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_APR_TYPE_DESKTOP_PAGE, ThunarAprDesktopPage))
+#define THUNAR_APR_DESKTOP_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_APR_TYPE_DESKTOP_PAGE, ThunarAprDesktopPageClass))
+#define THUNAR_APR_IS_DESKTOP_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_APR_TYPE_DESKTOP_PAGE))
+#define THUNAR_APR_IS_DESKTOP_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_APR_TYPE_DESKTOP_PAGE))
+#define THUNAR_APR_DESKTOP_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_APR_TYPE_DESKTOP_PAGE, ThunarAprDesktopPageClass))
+
+GType thunar_apr_desktop_page_get_type      (void) G_GNUC_CONST G_GNUC_INTERNAL;
+void  thunar_apr_desktop_page_register_type (ThunarxProviderPlugin *plugin) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_APR_DESKTOP_PAGE_H__ */
diff --git a/plugins/thunar-apr/thunar-apr-image-page.c b/plugins/thunar-apr/thunar-apr-image-page.c
new file mode 100644
index 0000000000000000000000000000000000000000..73977087c112074f5f68483be6d6646e503e62d7
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-image-page.c
@@ -0,0 +1,304 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <exo/exo.h>
+
+#include <thunar-apr/thunar-apr-image-page.h>
+
+#ifdef HAVE_EXIF
+#include <libexif/exif-data.h>
+#endif
+
+
+
+static void thunar_apr_image_page_class_init    (ThunarAprImagePageClass  *klass);
+static void thunar_apr_image_page_init          (ThunarAprImagePage       *image_page);
+static void thunar_apr_image_page_file_changed  (ThunarAprAbstractPage    *abstract_page,
+                                                 ThunarxFileInfo          *file);
+
+
+
+#ifdef HAVE_EXIF
+static const struct
+{
+  const gchar *name;
+  ExifTag      tag;
+} TAIP_EXIF[] =
+{
+  { N_ ("Date Taken:"),       EXIF_TAG_DATE_TIME,           },
+  { N_ ("Camera Brand:"),     EXIF_TAG_MAKE,                },
+  { N_ ("Camera Model:"),     EXIF_TAG_MODEL,               },
+  { N_ ("Exposure Time:"),    EXIF_TAG_EXPOSURE_TIME,       },
+  { N_ ("Exposure Program:"), EXIF_TAG_EXPOSURE_PROGRAM,    },
+  { N_ ("Aperture Value:"),   EXIF_TAG_APERTURE_VALUE,      },
+  { N_ ("Metering Mode:"),    EXIF_TAG_METERING_MODE,       },
+  { N_ ("Flash Fired:"),      EXIF_TAG_FLASH,               },
+  { N_ ("Focal Length:"),     EXIF_TAG_FOCAL_LENGTH,        },
+  { N_ ("Shutter Speed:"),    EXIF_TAG_SHUTTER_SPEED_VALUE, },
+  { N_ ("Software:"),         EXIF_TAG_SOFTWARE,            },
+};
+#endif
+
+
+  
+struct _ThunarAprImagePageClass
+{
+  ThunarAprAbstractPageClass __parent__;
+};
+
+struct _ThunarAprImagePage
+{
+  ThunarAprAbstractPage __parent__;
+  GtkWidget            *type_label;
+  GtkWidget            *dimensions_label;
+
+#ifdef HAVE_EXIF
+  GtkWidget            *exif_labels[G_N_ELEMENTS (TAIP_EXIF)];
+#endif
+};
+
+
+
+THUNARX_DEFINE_TYPE (ThunarAprImagePage,
+                     thunar_apr_image_page,
+                     THUNAR_APR_TYPE_ABSTRACT_PAGE);
+
+
+
+static void
+thunar_apr_image_page_class_init (ThunarAprImagePageClass *klass)
+{
+  ThunarAprAbstractPageClass *thunarapr_abstract_page_class;
+
+  thunarapr_abstract_page_class = THUNAR_APR_ABSTRACT_PAGE_CLASS (klass);
+  thunarapr_abstract_page_class->file_changed = thunar_apr_image_page_file_changed;
+}
+
+
+  
+static void
+thunar_apr_image_page_init (ThunarAprImagePage *image_page)
+{
+  AtkRelationSet *relations;
+  PangoAttribute *attribute;
+  PangoAttrList  *attr_list;
+  AtkRelation    *relation;
+  AtkObject      *object;
+  GtkWidget      *label;
+  GtkWidget      *table;
+#ifdef HAVE_EXIF
+  gint            n;
+#endif
+
+  gtk_container_set_border_width (GTK_CONTAINER (image_page), 12);
+  thunarx_property_page_set_label (THUNARX_PROPERTY_PAGE (image_page), _("Image"));
+
+  /* allocate shared bold Pango attributes */
+  attr_list = pango_attr_list_new ();
+  attribute = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
+  attribute->start_index = 0;
+  attribute->end_index = -1;
+  pango_attr_list_insert (attr_list, attribute);
+
+  table = gtk_table_new (3, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 0);
+  gtk_container_add (GTK_CONTAINER (image_page), table);
+  gtk_widget_show (table);
+
+  label = gtk_label_new (_("Image Type:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (label);
+
+  image_page->type_label = gtk_label_new ("");
+  gtk_label_set_selectable (GTK_LABEL (image_page->type_label), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (image_page->type_label), 0.0f, 0.5f);
+  gtk_label_set_ellipsize (GTK_LABEL (image_page->type_label), PANGO_ELLIPSIZE_END);
+  gtk_table_attach (GTK_TABLE (table), image_page->type_label, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (image_page->type_label);
+
+  /* set Atk label relation for the label */
+  object = gtk_widget_get_accessible (image_page->type_label);
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+  label = gtk_label_new (_("Image Size:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+  gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (label);
+
+  image_page->dimensions_label = gtk_label_new ("");
+  gtk_label_set_selectable (GTK_LABEL (image_page->dimensions_label), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (image_page->dimensions_label), 0.0f, 0.5f);
+  gtk_label_set_ellipsize (GTK_LABEL (image_page->dimensions_label), PANGO_ELLIPSIZE_END);
+  gtk_table_attach (GTK_TABLE (table), image_page->dimensions_label, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+  gtk_widget_show (image_page->dimensions_label);
+
+  /* set Atk label relation for the label */
+  object = gtk_widget_get_accessible (image_page->dimensions_label);
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+#ifdef HAVE_EXIF
+  /* some spacing between the General info and the Exif info */
+  gtk_table_set_row_spacing (GTK_TABLE (table), 2, 6);
+
+  /* add labels for the Exif info */
+  for (n = 0; n < G_N_ELEMENTS (TAIP_EXIF); ++n)
+    {
+      label = gtk_label_new (_(TAIP_EXIF[n].name));
+      gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+      gtk_label_set_attributes (GTK_LABEL (label), attr_list);
+      gtk_table_attach (GTK_TABLE (table), label, 0, 1, n + 3, n + 4, GTK_FILL, GTK_FILL, 0, 3);
+      gtk_widget_show (label);
+
+      image_page->exif_labels[n] = gtk_label_new ("");
+      gtk_label_set_selectable (GTK_LABEL (image_page->exif_labels[n]), TRUE);
+      gtk_misc_set_alignment (GTK_MISC (image_page->exif_labels[n]), 0.0f, 0.5f);
+      gtk_label_set_ellipsize (GTK_LABEL (image_page->exif_labels[n]), PANGO_ELLIPSIZE_END);
+      gtk_table_attach (GTK_TABLE (table), image_page->exif_labels[n], 1, 2, n + 3, n + 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+      gtk_widget_show (image_page->exif_labels[n]);
+
+      exo_binding_new (G_OBJECT (image_page->exif_labels[n]), "visible", G_OBJECT (label), "visible");
+
+      /* set Atk label relation for the label */
+      object = gtk_widget_get_accessible (image_page->exif_labels[n]);
+      relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+      relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+      atk_relation_set_add (relations, relation);
+      g_object_unref (G_OBJECT (relation));
+    }
+#endif
+
+  /* release shared bold Pango attributes */
+  pango_attr_list_unref (attr_list);
+}
+
+
+
+static void
+thunar_apr_image_page_file_changed (ThunarAprAbstractPage *abstract_page,
+                                    ThunarxFileInfo       *file)
+{
+  ThunarAprImagePage *image_page = THUNAR_APR_IMAGE_PAGE (abstract_page);
+  GdkPixbufFormat    *format;
+  gchar              *filename;
+  gchar              *text;
+  gchar              *uri;
+  gint                height;
+  gint                width;
+#ifdef HAVE_EXIF
+  ExifEntry          *exif_entry;
+  ExifData           *exif_data;
+  gchar               exif_buffer[1024];
+  gint                n;
+#endif
+
+  /* determine the URI for the file */
+  uri = thunarx_file_info_get_uri (file);
+  if (G_UNLIKELY (uri == NULL))
+    return;
+
+  /* determine the local path of the file */
+  filename = g_filename_from_uri (uri, NULL, NULL);
+  if (G_LIKELY (filename != NULL))
+    {
+      /* determine the pixbuf format */
+      format = gdk_pixbuf_get_file_info (filename, &width, &height);
+      if (G_LIKELY (format != NULL))
+        {
+          /* update the "Image Type" label */
+          text = g_strdup_printf ("%s (%s)", gdk_pixbuf_format_get_name (format), gdk_pixbuf_format_get_description (format));
+          gtk_label_set_text (GTK_LABEL (image_page->type_label), text);
+          g_free (text);
+
+          /* update the "Image Size" label */
+          text = g_strdup_printf (ngettext ("%dx%d pixel", "%dx%d pixels", width + height), width, height);
+          gtk_label_set_text (GTK_LABEL (image_page->dimensions_label), text);
+          g_free (text);
+
+#ifdef HAVE_EXIF
+          /* hide all Exif labels (will be shown again if data is available) */
+          for (n = 0; n < G_N_ELEMENTS (TAIP_EXIF); ++n)
+            gtk_widget_hide (image_page->exif_labels[n]);
+
+          /* try to load the Exif data for the file */
+          exif_data = exif_data_new_from_file (filename);
+          if (G_LIKELY (exif_data != NULL))
+            {
+              /* update all Exif labels */
+              for (n = 0; n < G_N_ELEMENTS (TAIP_EXIF); ++n)
+                {
+                  /* lookup the entry for the tag */
+                  exif_entry = exif_data_get_entry (exif_data, TAIP_EXIF[n].tag);
+                  if (G_LIKELY (exif_entry != NULL))
+                    {
+                      /* determine the value */
+                      if (exif_entry_get_value (exif_entry, exif_buffer, sizeof (exif_buffer)) != NULL)
+                        {
+                          /* setup the label text */
+                          text = (g_utf8_validate (exif_buffer, -1, NULL)) ? g_strdup (exif_buffer) : g_filename_display_name (exif_buffer);
+                          gtk_label_set_text (GTK_LABEL (image_page->exif_labels[n]), text);
+                          g_free (text);
+
+                          /* show the label */
+                          gtk_widget_show (image_page->exif_labels[n]);
+                        }
+                    }
+                }
+
+              /* cleanup */
+              exif_data_free (exif_data);
+            }
+#endif
+        }
+      else
+        {
+          /* tell the user that we're unable to determine the file info */
+          gtk_label_set_text (GTK_LABEL (image_page->type_label), _("Unknown"));
+          gtk_label_set_text (GTK_LABEL (image_page->dimensions_label), _("Unknown"));
+
+#ifdef HAVE_EXIF
+          /* hide all Exif labels */
+          for (n = 0; n < G_N_ELEMENTS (TAIP_EXIF); ++n)
+            gtk_widget_hide (image_page->exif_labels[n]);
+#endif
+        }
+    }
+
+  /* cleanup */
+  g_free (filename);
+  g_free (uri);
+}
+
+
+
+
diff --git a/plugins/thunar-apr/thunar-apr-image-page.h b/plugins/thunar-apr/thunar-apr-image-page.h
new file mode 100644
index 0000000000000000000000000000000000000000..79c3f014849b8b3ae3b6fb0352a7eacea02d71e5
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-image-page.h
@@ -0,0 +1,43 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __THUNAR_APR_IMAGE_PAGE_H__
+#define __THUNAR_APR_IMAGE_PAGE_H__
+
+#include <thunar-apr/thunar-apr-abstract-page.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarAprImagePageClass ThunarAprImagePageClass;
+typedef struct _ThunarAprImagePage      ThunarAprImagePage;
+
+#define THUNAR_APR_TYPE_IMAGE_PAGE            (thunar_apr_image_page_get_type ())
+#define THUNAR_APR_IMAGE_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_APR_TYPE_IMAGE_PAGE, ThunarAprImagePage))
+#define THUNAR_APR_IMAGE_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_APR_TYPE_IMAGE_PAGE, ThunarAprImagePageClass))
+#define THUNAR_APR_IS_IMAGE_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_APR_TYPE_IMAGE_PAGE))
+#define THUNAR_APR_IS_IMAGE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_APR_TYPE_IMAGE_PAGE))
+#define THUNAR_APR_IMAGE_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_APR_TYPE_IMAGE_PAGE, ThunarAprImagePageClass))
+
+GType thunar_apr_image_page_get_type      (void) G_GNUC_CONST G_GNUC_INTERNAL;
+void  thunar_apr_image_page_register_type (ThunarxProviderPlugin *plugin) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_APR_IMAGE_PAGE_H__ */
diff --git a/plugins/thunar-apr/thunar-apr-plugin.c b/plugins/thunar-apr/thunar-apr-plugin.c
new file mode 100644
index 0000000000000000000000000000000000000000..aaad3102cee3be4a5321c378696799d57bd72cd3
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-plugin.c
@@ -0,0 +1,84 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-apr/thunar-apr-abstract-page.h>
+#include <thunar-apr/thunar-apr-desktop-page.h>
+#include <thunar-apr/thunar-apr-image-page.h>
+#include <thunar-apr/thunar-apr-provider.h>
+
+
+
+static GType type_list[1];
+
+
+
+G_MODULE_EXPORT void
+thunar_extension_initialize (ThunarxProviderPlugin *plugin)
+{
+  const gchar *mismatch;
+
+  /* verify that the thunarx versions are compatible */
+  mismatch = thunarx_check_version (THUNARX_MAJOR_VERSION, THUNARX_MINOR_VERSION, THUNARX_MICRO_VERSION);
+  if (G_UNLIKELY (mismatch != NULL))
+    {
+      g_warning ("Version mismatch: %s", mismatch);
+      return;
+    }
+
+#ifdef G_ENABLE_DEBUG
+  g_message ("Initializing ThunarApr extension");
+#endif
+
+  /* register the types provided by this plugin */
+  thunar_apr_abstract_page_register_type (plugin);
+  thunar_apr_desktop_page_register_type (plugin);
+  thunar_apr_image_page_register_type (plugin);
+  thunar_apr_provider_register_type (plugin);
+
+  /* setup the plugin provider type list */
+  type_list[0] = THUNAR_APR_TYPE_PROVIDER;
+}
+
+
+
+G_MODULE_EXPORT void
+thunar_extension_shutdown (void)
+{
+#ifdef G_ENABLE_DEBUG
+  g_message ("Shutting down ThunarApr extension");
+#endif
+}
+
+
+
+G_MODULE_EXPORT void
+thunar_extension_list_types (const GType **types,
+                             gint         *n_types)
+{
+  *types = type_list;
+  *n_types = G_N_ELEMENTS (type_list);
+}
+
+
+
diff --git a/plugins/thunar-apr/thunar-apr-provider.c b/plugins/thunar-apr/thunar-apr-provider.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef2c44a234fcd4eb45030ec5a18749ea3446e711
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-provider.c
@@ -0,0 +1,122 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-apr/thunar-apr-desktop-page.h>
+#include <thunar-apr/thunar-apr-image-page.h>
+#include <thunar-apr/thunar-apr-provider.h>
+
+
+
+static void   thunar_apr_provider_class_init                  (ThunarAprProviderClass           *klass);
+static void   thunar_apr_provider_property_page_provider_init (ThunarxPropertyPageProviderIface *iface);
+static void   thunar_apr_provider_init                        (ThunarAprProvider                *apr_provider);
+static GList *thunar_apr_provider_get_pages                   (ThunarxPropertyPageProvider      *property_page_provider,
+                                                               GList                            *files);
+
+
+
+struct _ThunarAprProviderClass
+{
+  GObjectClass __parent__;
+};
+
+struct _ThunarAprProvider
+{
+  GObject __parent__;
+};
+
+
+
+THUNARX_DEFINE_TYPE_WITH_CODE (ThunarAprProvider,
+                               thunar_apr_provider,
+                               G_TYPE_OBJECT,
+                               THUNARX_IMPLEMENT_INTERFACE (THUNARX_TYPE_PROPERTY_PAGE_PROVIDER,
+                                                            thunar_apr_provider_property_page_provider_init));
+
+
+
+static void
+thunar_apr_provider_class_init (ThunarAprProviderClass *klass)
+{
+}
+
+
+
+static void
+thunar_apr_provider_property_page_provider_init (ThunarxPropertyPageProviderIface *iface)
+{
+  iface->get_pages = thunar_apr_provider_get_pages;
+}
+
+
+
+static void
+thunar_apr_provider_init (ThunarAprProvider *apr_provider)
+{
+}
+
+
+
+static GList*
+thunar_apr_provider_get_pages (ThunarxPropertyPageProvider *property_page_provider,
+                               GList                       *files)
+{
+  GSList *formats;
+  GSList *lp;
+  gchar **mime_types;
+  GList  *pages = NULL;
+  gint    n;
+
+  /* we can handle only property pages for a single file */
+  if (G_UNLIKELY (files == NULL || files->next != NULL))
+    return NULL;
+
+  /* ThunarAprDesktopPage case */
+  if (G_LIKELY (pages == NULL))
+    {
+      /* check if we have a .desktop file here */
+      if (thunarx_file_info_has_mime_type (files->data, "application/x-desktop"))
+        pages = g_list_append (pages, g_object_new (THUNAR_APR_TYPE_DESKTOP_PAGE, "file", files->data, NULL));
+    }
+
+  /* ThunarAprImagePage case */
+  if (G_LIKELY (pages == NULL))
+    {
+      /* determine the supported GdkPixbuf formats */
+      formats = gdk_pixbuf_get_formats ();
+      for (lp = formats; lp != NULL && pages == NULL; lp = lp->next)
+        {
+          /* check if any of the mime types of this format matches */
+          mime_types = gdk_pixbuf_format_get_mime_types (lp->data);
+          for (n = 0; mime_types[n] != NULL && pages == NULL; ++n)
+            if (thunarx_file_info_has_mime_type (files->data, mime_types[n]))
+              pages = g_list_append (pages, g_object_new (THUNAR_APR_TYPE_IMAGE_PAGE, "file", files->data, NULL));
+          g_strfreev (mime_types);
+        }
+      g_slist_free (formats);
+    }
+
+  return pages;
+}
+
diff --git a/plugins/thunar-apr/thunar-apr-provider.h b/plugins/thunar-apr/thunar-apr-provider.h
new file mode 100644
index 0000000000000000000000000000000000000000..077849abe020f31124b8223083d6fb1d2441da52
--- /dev/null
+++ b/plugins/thunar-apr/thunar-apr-provider.h
@@ -0,0 +1,43 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __THUNAR_APR_PROVIDER_H__
+#define __THUNAR_APR_PROVIDER_H__
+
+#include <thunarx/thunarx.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarAprProviderClass ThunarAprProviderClass;
+typedef struct _ThunarAprProvider      ThunarAprProvider;
+
+#define THUNAR_APR_TYPE_PROVIDER            (thunar_apr_provider_get_type ())
+#define THUNAR_APR_PROVIDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_APR_TYPE_PROVIDER, ThunarAprProvider))
+#define THUNAR_APR_PROVIDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_APR_TYPE_PROVIDER, ThunarAprProviderClass))
+#define THUNAR_APR_IS_PROVIDER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_APR_TYPE_PROVIDER))
+#define THUNAR_APR_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_APR_TYPE_PROVIDER))
+#define THUNAR_APR_PROVIDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_APR_TYPE_PROVIDER, ThunarAprProviderClass))
+
+GType thunar_apr_provider_get_type      (void) G_GNUC_CONST G_GNUC_INTERNAL;
+void  thunar_apr_provider_register_type (ThunarxProviderPlugin *plugin) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_APR_PROVIDER_H__ */
diff --git a/po/ChangeLog b/po/ChangeLog
index a55767a5030683eb9fc84bf107618bc252d92e81..f6a83721cbe228ce4cc40443be964386f465d736 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-12  Benedikt Meurer <benny@xfce.org>
+
+	* POTFILES.in: Add new files here.
+	* Thunar.pot, *.po: Merge new strings.
+	* de.po: Update german translations.
+
 2006-04-11  Daichi Kawahata <daichi@xfce.org>
 
 	* fi.po: Updated Finnish translations by Jari Rahkonen
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 14ef5142c6ff771c8f589633634b601e32817766..f051f51565fcf1195d4987146ac94d7fa20d5170 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -102,6 +102,12 @@ thunarx/thunarx-property-page.c
 thunarx/thunarx-provider-plugin.c
 thunarx/thunarx-renamer.c
 
+plugins/thunar-apr/thunar-apr-abstract-page.c
+plugins/thunar-apr/thunar-apr-desktop-page.c
+plugins/thunar-apr/thunar-apr-image-page.c
+plugins/thunar-apr/thunar-apr-plugin.c
+plugins/thunar-apr/thunar-apr-provider.c
+
 plugins/thunar-sbr/thunar-sbr-case-renamer.c
 plugins/thunar-sbr/thunar-sbr-enum-types.c
 plugins/thunar-sbr/thunar-sbr-insert-renamer.c
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 3ace24b17047e18c315a30a68b4e59ccf8db881b..0e649eb2377e8eded2dc7aa17719fbbf4886e734 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-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+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"
@@ -94,29 +94,29 @@ msgid "Unknown error"
 msgstr ""
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr ""
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr ""
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr ""
@@ -638,9 +638,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr ""
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr ""
 
@@ -2270,6 +2275,142 @@ msgstr ""
 msgid "The user visible name of the renamer"
 msgstr ""
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+msgid "Description:"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+msgid "Command:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+msgid "Comment:"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, c-format
+msgid "Failed to save \"%s\"."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+msgid "Exposure Program:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+msgid "Image"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+msgid "Image Type:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+msgid "Image Size:"
+msgstr ""
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 1a1aae764c1345d96ed7147f1f262465e4284d61..eeb9152bcd24a293419c7a3fced63e0f28e8cc83 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-04-08 00:18+0200\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -103,29 +103,29 @@ msgid "Unknown error"
 msgstr "Error desconegut"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "No heu especificat el camp Exec"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "No heu especificat el camp URL"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "El nom de l'escriptori no és vàlid"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "No s'ha pogut analitzar el fitxer"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "El nom del fitxer no és vàlid"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "No s'ha pogut consultar l'estat del fitxer \"%s\": %s"
@@ -664,9 +664,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Expandeix les columnes automàticament així com sigui necessari"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -2359,6 +2364,149 @@ msgstr "La URAL de la documentació del canviador de nom"
 msgid "The user visible name of the renamer"
 msgstr "El nom que l'usuari veu pel canviador de nom"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Descripció:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Ordre:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Ordre:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "No s'ha pogut suprimir \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Programa:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Fitxers d'imatge"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Fitxers d'imatge"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Fitxers d'imatge"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Con_vertir a:"
diff --git a/po/de.po b/po/de.po
index 990affdc25b8bbe87acbf9c7c0333c012e3dbe96..07804d88aa3b5d35c7f31915482b02ccd5811e7f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
-"PO-Revision-Date: 2006-04-09 19:20+0100\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
+"PO-Revision-Date: 2006-04-12 22:05+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -105,29 +105,29 @@ msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Das Exec-Feld fehlt oder ist leer"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Das URL-Feld fehlt oder ist leer"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Ungültige .desktop Datei"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Konnte Datei nicht parsen"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Ungültiger Dateiname"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Dateiinformationen für »%s« konnten nicht bestimmt werden: %s"
@@ -668,9 +668,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Listenspalten automatisch ver_größern"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -2391,6 +2396,145 @@ msgstr "Die URL der Dokumentation des Umbenennungs-Moduls"
 msgid "The user visible name of the renamer"
 msgstr "Der angezeigte Name des Umbenennungs-Moduls"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+msgid "Command:"
+msgstr "Befehl:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+"Der auszuführende Befehl, möglicherweise mit Kommandozeilen-Parametern."
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr "Adresse:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr "Die Adresse einer Webseite oder einer ähnlichen Resource."
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr "Optionen:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr "Benutze _Startup Notifikation"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr "In _Terminal ausführen"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+"Ist diese Option aktiv, wird der oben angegebene Befehl in einem Terminal-"
+"Fenster ausgeführt."
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr "Starter"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr "Link"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Die Datei »%s« konnte nicht gespeichert werden."
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr "Aufnahmedatum:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr "Kameramarke:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr "Kameramodell:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr "Belichtungsdauer:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+msgid "Exposure Program:"
+msgstr "Belichtungsprogr.:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr "Blendenwert:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr "Messmethode:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr "Blitzlicht:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr "Brennweite:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr "Verschlußgeschw.:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr "Software:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+msgid "Image"
+msgstr "Bild"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+msgid "Image Type:"
+msgstr "Bildtyp:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+msgid "Image Size:"
+msgstr "Bildgröße:"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] "%dx%d Pixel"
+msgstr[1] "%dx%d Pixel"
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "U_mwandeln in:"
@@ -2855,3 +2999,6 @@ msgstr "Ordner öffnen"
 #: ../Thunar-folder-handler.desktop.in.in.h:2
 msgid "Open the specified folders in Thunar"
 msgstr "Angegebene Ordner mit Thunar öffnen"
+
+#~ msgid "ISO Speed Rating:"
+#~ msgstr "Geschw.-Schätzung:"
diff --git a/po/el.po b/po/el.po
index 27ac6ed39caf363afa2ce19ce998f5b79b499d5d..aacfb3a89a9b74da5ab50a9098513f2281467a2e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-04-08 14:20+0200\n"
 "Last-Translator: Stathis Kamperis <ekamperi@auth.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -107,29 +107,29 @@ msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Δεν έχει οριστεί το πεδίο Exec"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Δεν έχει οριστεί το πεδίο URL"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Μη έγκυρο αρχείο συντόμευσης"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Δεν ήταν δυνατή η ανάγνωση του αρχείου"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Δεν ήταν δυνατή η λήψη της κατάστασης του αρχείου \"%s\": %s"
@@ -668,9 +668,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Αυτόματη _επέκταση στηλών"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Άγνωστο"
 
@@ -2367,6 +2372,149 @@ msgstr "Το URL για την τεκμηρίωση του μετονομαστ
 msgid "The user visible name of the renamer"
 msgstr "Το ορατό από το χρήστη όνομα του μετονομαστή"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Περιγραφή:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Εντολή:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Εντολή:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Η διαγραφή του \"%s\" απέτυχε"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Πρόγραμμα:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Αρχεία εικόνων"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Αρχεία εικόνων"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Αρχεία εικόνων"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Μετατ_ροπή σε:"
diff --git a/po/es.po b/po/es.po
index 005b91e6526bfa92bdfd49ad10327c2fc14c6165..409899a80adabb9cb4593c6c047d5eae56def5b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Miguel Angel Ruiz Manzano <debianized@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -104,31 +104,31 @@ msgid "Unknown error"
 msgstr "Error desconocido"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Campo Exec no especificado"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Campo URL no especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Archivo de escritorio no válido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 #, fuzzy
 msgid "Failed to parse file"
 msgstr "No se puede analizar el archivo"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "El nombre de archivo no es válido"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, fuzzy, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "No se puede ejecutar 'stat' sobre el archivo \"%s\": %s."
@@ -677,9 +677,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Automáticamente _expandir las columnas según se requiera"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr ""
 
@@ -2404,6 +2409,148 @@ msgstr "Abre la carpeta anterior"
 msgid "The user visible name of the renamer"
 msgstr ""
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Dirección"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "Orden"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "Orden"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "No se pudo eliminar \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+msgid "Exposure Program:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "_Pegar archivos"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "_Pegar archivos"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "_Pegar archivos"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""
diff --git a/po/et.po b/po/et.po
index 114ff23d28384fcf900ead29058abdf4bfcd70d4..f2998f862f01e5d11063aea037d16769e407c9bd 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-03-29 17:57+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@proekspert.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -103,29 +103,29 @@ msgid "Unknown error"
 msgstr "Tundamtu viga"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Käivita väli on puudu"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "URL väli on puudu"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Sobimatu desktop fail"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Faili lugemine ebaõnnestus"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Faili nime viga"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Faili \"%s\" info hankimine läks nässu: %s"
@@ -655,9 +655,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr ""
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -2386,6 +2391,149 @@ msgstr "Dokumentide sirvuri avamine läks nässu"
 msgid "The user visible name of the renamer"
 msgstr "Miimi käsitleja nimi"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Kirjeldus:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Käsklus:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Käsklus:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "\"%s\"-i eemaldamine läks nässu"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Programm:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Pildi failid"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Pildi failid"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Pildi failid"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index be281122c543f68d39920d9114457f3c539dcde2..609d9710e14c8d3ef0577253ab590cab5cbdfdac 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-02-22 12:03+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -106,29 +106,29 @@ msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Ez da Exec eremua zehaztu"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Ez da URL eremua zehaztu"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Idazmahai fitxategi baliogabea"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Huts fitxategia analizatzerakoan"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Fitxategi izen baliogabea"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Huts \"%s\" fitxategiaren egoera eskuratzekoan: %s"
@@ -660,9 +660,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr ""
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -2379,6 +2384,149 @@ msgstr "Huts txantiloi karpeta irekitzerakoan"
 msgid "The user visible name of the renamer"
 msgstr "Mime kudeatzailearen izena"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Azalpena:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_komandoa:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_komandoa:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Huts \"%s\" ezabatzerakoan"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Programa:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Irudi Fitxategiak"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Irudi Fitxategiak"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Irudi Fitxategiak"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 48bde9d4fc51dfb66374000e1841c099e3361f7b..3560dba74ddf1ffef0caf231c782254f7f4920d8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-04-10 23:11+0300\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -102,29 +102,29 @@ msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Exec-kenttää ei ole määritetty"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "URL-kenttää ei ole määritetty"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Epäkelpo desktop-tiedosto"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Tiedoston jäsentäminen epäonnistui"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Tiedostonimi ei kelpaa"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Tiedoston \"%s\" stat epäonnistui: %s"
@@ -662,9 +662,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "_Laajenna sarakkeet automaattisesti tarvittaessa"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -2356,6 +2361,149 @@ msgstr "Nimeäjän dokumentaatioon osoittava URL"
 msgid "The user visible name of the renamer"
 msgstr "Nimeäjän käyttäjälle näkyvä nimi"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Kuvaus:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Komento:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Komento:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Kohdetta \"%s\" ei voi poistaa"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Sovellus:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Kuvatiedostot"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Kuvatiedostot"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Kuvatiedostot"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Muuta _muotoon:"
diff --git a/po/fr.po b/po/fr.po
index 0e45ee093ca08dc68d5b5cc7e0ac6f70036cbe35..0372131a972baa805b6c2b4a8d9332bc699e3c6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-04-02 14:05+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -103,29 +103,29 @@ msgid "Unknown error"
 msgstr "Erreur inconnue"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Aucun champ Exec spécifié"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Aucune URL spécifiée"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Fichier de bureau invalide"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Échec pour analyser le fichier"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Nom de fichier invalide"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Échec pour récupérer le statut du fichier \"%s\" : %s"
@@ -656,9 +656,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr ""
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -2347,6 +2352,149 @@ msgstr ""
 msgid "The user visible name of the renamer"
 msgstr ""
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Commande :"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Commande :"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Échec à la suppression de \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Programme :"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Fichiers image"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Fichiers image"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Fichiers image"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Con_vertir en :"
diff --git a/po/hu.po b/po/hu.po
index eeebbdf02cf9bcaa6ca2b38b615f56f796ec0de8..ec9ef74386ae2ba2e10b7c1473b026234591e353 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-03-26 10:26+0100\n"
 "Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -104,29 +104,29 @@ msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Nincs Exec mező megadva"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Nincs URL megadva"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Hibás .desktop fájl"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "A fájl elemzése meghiúsult"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Érvénytelen fájl név"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "\"%s\" elérése sikertelen: %s"
@@ -660,9 +660,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Oszlopok nyújtása, ha szükséges"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -2307,6 +2312,149 @@ msgstr ""
 msgid "The user visible name of the renamer"
 msgstr ""
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "Paran_cs:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "Paran_cs:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Nem törölhető: \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Program:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Képfájlok"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Képfájlok"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Képfájlok"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Módosítsd így:"
diff --git a/po/it.po b/po/it.po
index b937c134ce4dfb293261d825e5b45ec818b30e23..17d78434a71472c2032b2a5b273e543fe84e9c26 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-03-04 13:55+0100\n"
 "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -106,29 +106,29 @@ msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Campo Exec non specificato"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Campo URL non specificato"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Desktop file non valido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Impossibile fare il parsing del file"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Nome del file non valido"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Stat del file \"%s\" fallito: %s"
@@ -663,9 +663,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr ""
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -2403,6 +2408,149 @@ msgstr "Impossibile aprire il browser della documentazione"
 msgid "The user visible name of the renamer"
 msgstr "Il nome del gestore mime"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Descrizione:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Comando:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Comando:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Impossibile rimuovere \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Programma:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "File di Immagine"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "File di Immagine"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "File di Immagine"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index ab203bb6b14409e7a96f412ddcba0eaa03941286..215c13b1cb9caa4bd3fde0f4dd67eb53c470fbdf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-04-08 21:38+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -114,29 +114,29 @@ msgid "Unknown error"
 msgstr "原因不明のエラーが発生しました。"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "デスクトップファイルの「Exec」フィールドが指定されていません。"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "デスクトップファイルの「URL」フィールドが指定されていません。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "無効なデスクトップファイルです。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "ファイルを解析できません。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "無効なファイル名です。"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "ファイル「%s」の状態を取得するのに失敗しました: %s"
@@ -679,9 +679,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "必要に応じて表示欄を自動的に拡げる(_E)"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "不明"
 
@@ -2359,6 +2364,149 @@ msgstr "リネーム・プラグインの文書の URL です。"
 msgid "The user visible name of the renamer"
 msgstr "リネーム・プラグインの表示名です。"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "説明(_D):"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "コマンド(_C):"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "コマンド(_C):"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "「%s」の削除に失敗しました。"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "プログラム:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "画像ファイル"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "画像ファイル"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "画像ファイル"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "次に変換(_V):"
diff --git a/po/nl.po b/po/nl.po
index ae50481350e506ebfd7c2e9aac76d8212c4ee54c..63fc800769ca44e9d322e5f49a818cf2f8910290 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+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"
@@ -107,7 +107,7 @@ msgstr "Onbekende eigenaar"
 # Unknown word "Exec"
 # Obekend woord: "Exec"
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 #, fuzzy
 msgid "No Exec field specified"
 msgstr "Geen <Exec> veld geselecteerd"
@@ -115,28 +115,28 @@ msgstr "Geen <Exec> veld geselecteerd"
 # Unknown word "Exec"
 # Obekend woord: "Exec"
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Geen <Exec> veld geselecteerd"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Ongeldig bureublad-bestand"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 #, fuzzy
 msgid "Failed to parse file"
 msgstr "Verwerken van bestand niet mogelijk"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Ongeldige bestandsnaam"
 
 # Unknown word "stat"
 # Obekend woord: "stat"
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, fuzzy, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Het <stat> van bestand `%s' is mislukt: %s"
@@ -687,9 +687,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Kolommen automatisch _uitklappen wanneer nodig"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -2461,6 +2466,149 @@ msgstr "Fout bij het openen van de sjablonen map"
 msgid "The user visible name of the renamer"
 msgstr "Naam van mime <handler>"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Beschrijving:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Commando:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Commando:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Het verwijderen van `%s' is mislukt: %s"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Programma:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Afbeeldingen"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Afbeeldingen"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Afbeeldingen"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Ver_ander naar:"
diff --git a/po/pl.po b/po/pl.po
index 2ac853a6d9d4e5a46fa566340940f168e4c93551..44070c1fdeb2d9d99270d1d1d24e4f89e6234d68 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-01-13 14:21+0100\n"
 "Last-Translator: Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -104,31 +104,31 @@ msgid "Unknown error"
 msgstr "data nieznana"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Brak pola Exec"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 #, fuzzy
 msgid "No URL field specified"
 msgstr "Brak pola Exec"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Nieprawidłowy plik .desktop"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 #, fuzzy
 msgid "Failed to parse file"
 msgstr "Nie mogę wczytać pliku"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Nieprawidłowa nazwa pliku"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, fuzzy, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Nie mogę odczytać atrybutów pliku '%s': %s"
@@ -665,9 +665,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr ""
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 #, fuzzy
 msgid "Unknown"
 msgstr "data nieznana"
@@ -2405,6 +2410,146 @@ msgstr "Otwórz katalog nadrzędny"
 msgid "The user visible name of the renamer"
 msgstr ""
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "Położenie:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+msgid "Command:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+msgid "Comment:"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Nie udało się usunąć pliku '%s': %s"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+msgid "Exposure Program:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "W_klej pliki"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "W_klej pliki"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "W_klej pliki"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b6cb962b96056db261253ad3e052f9b17ac4c191..f6070fd5916b930cc0b1b9e078e16011e39afbe0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-03-31 21:46-0300\n"
 "Last-Translator: Adriano Winter Bess <awbess@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -104,29 +104,29 @@ msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Nenhum campo Exec especificado"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Nenhum campo URL especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Arquivo de área de trabalho inválido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Falhou ao interpretar o arquivo"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Nome de arquivo inválido"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Falhou ao fazer \"stat\" no arquivo \"%s\": %s"
@@ -665,9 +665,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "_Expandir automaticamente as colunas quando necessário"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -2369,6 +2374,149 @@ msgstr "A URL para a documentação do renomeador"
 msgid "The user visible name of the renamer"
 msgstr "O nome do renomeador visível ao usuário"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Descrição:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Comando:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Comando:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Falhou ao remover \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Programa:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Arquivos de Imagem"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Arquivos de Imagem"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Arquivos de Imagem"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Con_verter para:"
diff --git a/po/ru.po b/po/ru.po
index f1c447eb2dce14ce70565b720927180ec412f2b5..617372ff83e8efa48bd4b54be1b23096ed1a0eea 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-03-25 15:15+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -105,29 +105,29 @@ msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Не указано поле Exec"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Не указано поле URL"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Некорректный .desktop-файл"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Не удалось провести разбор файла"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Недопустимое имя файла"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Не удалось выполнить команду stat для файла \"%s\": %s"
@@ -666,9 +666,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "Автоматически увеличивать ширину столбцов при необходимости"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -2382,6 +2387,149 @@ msgstr "Адрес, по которому расположена докумен
 msgid "The user visible name of the renamer"
 msgstr "Видимое для пользователя название инструмента переименования"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Описание:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Команда:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Команда:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "Не удалось удалить \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Программа:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Изображения"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Изображения"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Изображения"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr "Преобразовать к:"
diff --git a/po/sv.po b/po/sv.po
index 7dae87c0d80a5f49c2c2099adb185ff4451ed3f6..1118c3e4c1b2cf2301a83ef8d10aa36c5797e79b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-02-22 16:28+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -103,29 +103,29 @@ msgid "Unknown error"
 msgstr "Okänt fel"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Inget \"Exec\"-fält angivet"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "Inget \"URL\"-fält angivet"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "Ogiltig desktop-fil"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "Misslyckades att tolka fil"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "Ogiltigt filnamn"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "Misslyckades att läsa status på \"%s\": %s"
@@ -658,9 +658,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr ""
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -2388,6 +2393,149 @@ msgstr "Misslyckades att öppna mallmapp"
 msgid "The user visible name of the renamer"
 msgstr "Namnet på mime-handtaget"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+#, fuzzy
+msgid "Description:"
+msgstr "_Beskrivning:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "_Kommando:"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "_Kommando:"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "misslyckades att ta bort \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "Program:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "Bildfiler"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "Bildfiler"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "Bildfiler"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1732abe9284ed7271f76bfa69c8113f782fcf60d..5da0a0d0239e939cf66fcb122c715a570693f001 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 20:15+0900\n"
+"POT-Creation-Date: 2006-04-12 22:10+0200\n"
 "PO-Revision-Date: 2006-04-06 00:24+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -102,29 +102,29 @@ msgid "Unknown error"
 msgstr "未知的錯誤"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:377
+#: ../thunar-vfs/thunar-vfs-info.c:378
 msgid "No Exec field specified"
 msgstr "Exec 欄並未指定"
 
 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:396
+#: ../thunar-vfs/thunar-vfs-info.c:397
 msgid "No URL field specified"
 msgstr "URL 欄並未指定"
 
-#: ../thunar-vfs/thunar-vfs-info.c:401 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:402 ../thunar-vfs/thunar-vfs-info.c:527
 msgid "Invalid desktop file"
 msgstr "無效的桌面檔案"
 
-#: ../thunar-vfs/thunar-vfs-info.c:409
+#: ../thunar-vfs/thunar-vfs-info.c:410
 msgid "Failed to parse file"
 msgstr "無法處理檔案"
 
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:505
 msgid "Invalid file name"
 msgstr "無效的檔名"
 
 #. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:758
+#: ../thunar-vfs/thunar-vfs-info.c:762
 #, c-format
 msgid "Failed to stat file \"%s\": %s"
 msgstr "無法 stat 檔案 \"%s\":%s"
@@ -650,9 +650,14 @@ msgstr ""
 msgid "Automatically _expand columns as needed"
 msgstr "依需求自動延展欄位(_E)"
 
+#. reset page title
+#. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:738
 #: ../thunar/thunar-list-model.c:767
 #: ../thunar/thunar-permissions-chooser.c:270
+#: ../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
 msgid "Unknown"
 msgstr "未知的"
 
@@ -2275,6 +2280,148 @@ msgstr "無法開啟文件瀏覽器"
 msgid "The user visible name of the renamer"
 msgstr "mime 處置程式的名稱"
 
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:158
+msgid "Description:"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
+#, fuzzy
+msgid "Command:"
+msgstr "指令"
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:188
+msgid "The program to execute, possibly with arguments."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:203
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:210
+msgid "The URL to access."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:225
+#, fuzzy
+msgid "Comment:"
+msgstr "指令"
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
+msgid "Options:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:258
+msgid "Use _startup notification"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
+msgid "Run in _terminal"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
+msgid "Select this option to run the command in a terminal window."
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
+msgid "Launcher"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:344
+msgid "Link"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:560
+#, fuzzy, c-format
+msgid "Failed to save \"%s\"."
+msgstr "無法移除 \"%s\""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:49
+msgid "Date Taken:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:50
+msgid "Camera Brand:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:51
+msgid "Camera Model:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:52
+msgid "Exposure Time:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:53
+#, fuzzy
+msgid "Exposure Program:"
+msgstr "程式:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:54
+msgid "Aperture Value:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:55
+msgid "Metering Mode:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:56
+msgid "Flash Fired:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:57
+msgid "Focal Length:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:58
+msgid "Shutter Speed:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "Software:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#, fuzzy
+msgid "Image"
+msgstr "圖像檔"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#, fuzzy
+msgid "Image Type:"
+msgstr "圖像檔"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
+#, fuzzy
+msgid "Image Size:"
+msgstr "圖像檔"
+
+#. update the "Image Size" label
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#, c-format
+msgid "%dx%d pixel"
+msgid_plural "%dx%d pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../plugins/thunar-sbr/thunar-sbr-case-renamer.c:119
 msgid "Con_vert to:"
 msgstr ""