[Goodies-commits] r1474 - in xfce4-mount-plugin/trunk: . panel-plugin po

Fabian Nowak timystery at xfce.org
Fri Jul 7 21:03:47 CEST 2006


Author: timystery
Date: 2006-07-07 19:03:37 +0000 (Fri, 07 Jul 2006)
New Revision: 1474

Modified:
   xfce4-mount-plugin/trunk/aclocal.m4
   xfce4-mount-plugin/trunk/config.h.in
   xfce4-mount-plugin/trunk/configure.ac
   xfce4-mount-plugin/trunk/panel-plugin/Makefile
   xfce4-mount-plugin/trunk/panel-plugin/Makefile.in
   xfce4-mount-plugin/trunk/po/Makefile.in
   xfce4-mount-plugin/trunk/po/Makefile.in.in
   xfce4-mount-plugin/trunk/po/ca.po
   xfce4-mount-plugin/trunk/po/de.po
   xfce4-mount-plugin/trunk/po/el.po
   xfce4-mount-plugin/trunk/po/eu.po
   xfce4-mount-plugin/trunk/po/fr.po
   xfce4-mount-plugin/trunk/po/hu.po
   xfce4-mount-plugin/trunk/po/ja.po
   xfce4-mount-plugin/trunk/po/ko.po
   xfce4-mount-plugin/trunk/po/lt.po
   xfce4-mount-plugin/trunk/po/no.po
   xfce4-mount-plugin/trunk/po/pl.po
   xfce4-mount-plugin/trunk/po/ru.po
   xfce4-mount-plugin/trunk/po/uk.po
   xfce4-mount-plugin/trunk/po/vi.po
   xfce4-mount-plugin/trunk/po/xfce4-mount-plugin.pot
Log:
Updated german translation, configure.ac - whoever broke it...


Modified: xfce4-mount-plugin/trunk/aclocal.m4
===================================================================
--- xfce4-mount-plugin/trunk/aclocal.m4	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/aclocal.m4	2006-07-07 19:03:37 UTC (rev 1474)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -13,25 +13,28 @@
 
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 2 IT_PROG_INTLTOOL
+# serial 35 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL],
-[
+[AC_PREREQ([2.50])dnl
 
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
 if test -n "$1"; then
     AC_MSG_CHECKING(for intltool >= $1)
 
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }'  < ${ac_aux_dir}/intltool-update.in`
-    changequote({{,}})
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-    changequote([,])
-
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    else
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool $1 or later.])
-	exit 1
-    fi
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+    ]
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
 fi
 
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -51,6 +54,7 @@
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
 AC_SUBST(INTLTOOL_DESKTOP_RULE)
 AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -69,17 +73,13 @@
 AC_SUBST(INTLTOOL_CAVES_RULE)
 AC_SUBST(INTLTOOL_SCHEMAS_RULE)
 AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
 
 # Use the tools built into the package, not the ones that are installed.
+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
 
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-AC_SUBST(INTLTOOL_EXTRACT)
-AC_SUBST(INTLTOOL_MERGE)
-AC_SUBST(INTLTOOL_UPDATE)
-
 AC_PATH_PROG(INTLTOOL_PERL, perl)
 if test -z "$INTLTOOL_PERL"; then
    AC_MSG_ERROR([perl not found; required for intltool])
@@ -101,104 +101,96 @@
 AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
 AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
 
-# Remove file type tags (using []) from po/POTFILES.
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+    
+IT_PO_SUBDIR([po])
 
-ifdef([AC_DIVERSION_ICMDS],[
-  AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-      changequote(,)
-      mv -f po/POTFILES po/POTFILES.tmp
-      sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-      rm -f po/POTFILES.tmp
-      changequote([,])
-  AC_DIVERT_POP()
-],[
-  ifdef([AC_CONFIG_COMMANDS_PRE],[
-    AC_CONFIG_COMMANDS_PRE([
-        changequote(,)
-        mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
-        changequote([,])
-    ])
-  ])
+dnl The following is very similar to
+dnl
+dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+dnl
+dnl with the following slight differences:
+dnl  - the *.in files are in ac_aux_dir,
+dnl  - if the file haven't changed upon reconfigure, it's not touched,
+dnl  - the evaluation of the third parameter enables a hack which computes
+dnl    the actual value of $libdir,
+dnl  - the user sees "executing intltool commands", instead of
+dnl    "creating intltool-extract" and such.
+dnl
+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+dnl a reason for it.
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+AC_CONFIG_COMMANDS([intltool], [
+
+for file in intltool-extract intltool-merge intltool-update; do
+  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
+      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
+      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
+      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+	< ${ac_aux_dir}/${file}.in > ${file}.out
+  if cmp -s ${file} ${file}.out 2>/dev/null; then
+    rm -f ${file}.out
   else
-    mkdir_p='$(install_sh) -d'
+    mv -f ${file}.out ${file}
   fi
-fi
-AC_SUBST([mkdir_p])
-])
+  chmod ugo+x ${file}
+  chmod u+w ${file}
+done
 
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
+],
+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
 
-AC_CONFIG_COMMANDS([intltool], [
+])
 
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#g' \
-               -e 's#@INTLTOOL_ICONV@#${INTLTOOL_ICONV}#g' \
-               -e 's#@INTLTOOL_MSGFMT@#${INTLTOOL_MSGFMT}#g' \
-               -e 's#@INTLTOOL_MSGMERGE@#${INTLTOOL_MSGMERGE}#g' \
-               -e 's#@INTLTOOL_XGETTEXT@#${INTLTOOL_XGETTEXT}#g' \
-               -e 's#@INTLTOOL_PERL@#${INTLTOOL_PERL}#g'"
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    if test ! -f "$1/Makefile"; then
+      AC_MSG_ERROR([$1/Makefile is not ready.])
+    fi
+    mv "$1/Makefile" "$1/Makefile.tmp"
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.tmp" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
-
-], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-XGETTEXT='${INTLTOOL_XGETTEXT}')
-
-])
-
 # deprecated macros
-AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
 
 
 # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
@@ -218,7 +210,7 @@
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -1079,13 +1071,408 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-dnl $Id: xdt-depends.m4 2273 2005-01-31 19:38:09Z benny $
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
 dnl
-dnl Copyright (c) 2002-2005
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+  [AC_CHECK_HEADERS([locale.h])
+    if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [USE_NLS=yes
+    AC_SUBST(USE_NLS)
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        [AC_TRY_LINK([
+#include <libintl.h>
+],
+          [return (int) dgettext ("","")],
+	  gt_cv_func_dgettext_libc=yes,
+          gt_cv_func_dgettext_libc=no)
+        ])
+  
+      if test "$gt_cv_func_dgettext_libc" = "yes" ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, dgettext,
+		          gt_cv_func_dgettext_libintl=yes)])
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+	  AC_MSG_RESULT([])
+          AC_CHECK_LIB(intl, dcgettext,
+		       [gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv],
+			:,-liconv)
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS="$glib_save_LIBS"
+
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+  
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+  
+      if test "$gt_cv_have_gettext" = "yes"; then
+	AC_DEFINE(HAVE_GETTEXT,1,
+	  [Define if the GNU gettext() function is already present or preinstalled.])
+	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  AC_CHECK_FUNCS(dcgettext)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
+	    [CATOBJEXT=.gmo 
+             DATADIRNAME=share],
+	    [case $host in
+	    *-*-solaris*)
+	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+	    dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+	    dnl Hence, we'd like to go with DATADIRNAME=share and
+	    dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+	      [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+	      [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac])
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
+    fi
+
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; then
+      dnl If it is not GNU xgettext we define it as : so that the
+      dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    AC_OUTPUT_COMMANDS(
+      [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(PO_IN_DATADIR_TRUE)
+    AC_SUBST(PO_IN_DATADIR_FALSE)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation 
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by 
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   
+   GLIB_LC_MESSAGES
+   GLIB_WITH_NLS
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+  [Define the location where the catalogs will be installed])
+])
+
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_in,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+dnl $Id: xdt-depends.m4 21591 2006-05-08 09:10:26Z benny $
+dnl
+dnl Copyright (c) 2002-2006
 dnl         The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
 dnl
+dnl This program is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the Free
+dnl Software Foundation; either version 2 of the License, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+dnl more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along with
+dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+dnl Place, Suite 330, Boston, MA  02111-1307  USA
+dnl
 dnl xdt-depends
 dnl -----------
 dnl  Contains M4 macros to check for software dependencies.
@@ -1194,7 +1581,7 @@
 
     ifelse([$4], , , [$4])
   elif $PKG_CONFIG --exists "$2" >/dev/null 2>&1; then
-    xdg_cv_version=`$PKG_CONFIG --modversion "$2"`
+    xdt_cv_version=`$PKG_CONFIG --modversion "$2"`
     AC_MSG_RESULT([found, but $xdt_cv_version])
 
     ifelse([$5], ,
@@ -1495,13 +1882,27 @@
 ])
 
 
-dnl $Id: xdt-features.m4 2282 2005-03-19 16:00:31Z benny $
+dnl $Id: xdt-features.m4 21591 2006-05-08 09:10:26Z benny $
 dnl
-dnl Copyright (c) 2002-2005
+dnl Copyright (c) 2002-2006
 dnl         The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
 dnl
+dnl This program is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the Free
+dnl Software Foundation; either version 2 of the License, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+dnl more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along with
+dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+dnl Place, Suite 330, Boston, MA  02111-1307  USA
+dnl
 dnl xdt-depends
 dnl -----------
 dnl  Contains M4 macros to check for software dependencies.
@@ -1529,7 +1930,6 @@
     AC_DEFINE([DEBUG], [1], [Define for debugging support])
     
     xdt_cv_additional_CFLAGS="-Wall"
-    xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -DG_DISABLE_DEPRECATED"
     xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -DXFCE_DISABLE_DEPRECATED"
     
     if test x"$enable_debug" = x"full"; then
@@ -1628,13 +2028,27 @@
   fi
 ])
 
-dnl $Id: xdt-i18n.m4 2278 2005-03-08 15:23:49Z benny $
+dnl $Id: xdt-i18n.m4 21591 2006-05-08 09:10:26Z benny $
 dnl
-dnl Copyright (c) 2002-2005
+dnl Copyright (c) 2002-2006
 dnl         The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
 dnl
+dnl This program is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the Free
+dnl Software Foundation; either version 2 of the License, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+dnl more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along with
+dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+dnl Place, Suite 330, Boston, MA  02111-1307  USA
+dnl
 dnl xdt-i18n
 dnl --------
 dnl  Internalization M4 macros.
@@ -1705,390 +2119,3 @@
 ])
 
 
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-         [return (int) ngettext ("","", 1)],
-	  gt_cv_func_ngettext_libc=yes,
-          gt_cv_func_ngettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        	[AC_TRY_LINK([
-#include <libintl.h>
-],
-	          [return (int) dgettext ("","")],
-		  gt_cv_func_dgettext_libc=yes,
-	          gt_cv_func_dgettext_libc=no)
-        	])
-      fi
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, ngettext,
-		    [AC_CHECK_LIB(intl, dgettext,
-			          gt_cv_func_dgettext_libintl=yes)])])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-  	  AC_CHECK_LIB(intl, ngettext,
-          	[AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)],
-		:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-

Modified: xfce4-mount-plugin/trunk/config.h.in
===================================================================
--- xfce4-mount-plugin/trunk/config.h.in	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/config.h.in	2006-07-07 19:03:37 UTC (rev 1474)
@@ -102,6 +102,9 @@
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
+/* "Data dir" */
+#undef PACKAGE_DATA_DIR
+
 /* Define to the full name of this package. */
 #undef PACKAGE_NAME
 
@@ -137,5 +140,5 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t

Modified: xfce4-mount-plugin/trunk/configure.ac
===================================================================
--- xfce4-mount-plugin/trunk/configure.ac	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/configure.ac	2006-07-07 19:03:37 UTC (rev 1474)
@@ -67,6 +67,24 @@
 dnl Check for debugging support
 XDT_FEATURE_DEBUG()
 
+dnl Set PACKAGE PREFIX
+if test "x${prefix}" = "xNONE"; then
+  packageprefix=${ac_default_prefix}
+else
+  packageprefix=${prefix}
+fi
+
+dnl Set PACKAGE DATA & DOC DIR
+packagedatadir=share
+
+dnl Subst PACKAGE_DATA_DIR.
+NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
+AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
+PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
+AC_SUBST(PACKAGE_DATA_DIR)
+
+AC_DEFINE_UNQUOTED([PACKAGE_DATA_DIR], "${packageprefix}/${packagedatadir}", ["Data dir"])
+
 AC_OUTPUT([
 Makefile
 xfce4-mount-plugin.spec

Modified: xfce4-mount-plugin/trunk/panel-plugin/Makefile
===================================================================
--- xfce4-mount-plugin/trunk/panel-plugin/Makefile	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/panel-plugin/Makefile	2006-07-07 19:03:37 UTC (rev 1474)
@@ -72,15 +72,15 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/tim/mount-plugin.berlios/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/tim/xfce4-mount-plugin/missing --run aclocal-1.9
 ALL_LINGUAS = ca de el eu fr hu ja ko lt no pl ru uk vi
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/tim/mount-plugin.berlios/missing --run tar
-AUTOCONF = ${SHELL} /home/tim/mount-plugin.berlios/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/tim/mount-plugin.berlios/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/tim/mount-plugin.berlios/missing --run automake-1.9
-AWK = mawk
+AMTAR = ${SHELL} /home/tim/xfce4-mount-plugin/missing --run tar
+AUTOCONF = ${SHELL} /home/tim/xfce4-mount-plugin/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/tim/xfce4-mount-plugin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/tim/xfce4-mount-plugin/missing --run automake-1.9
+AWK = gawk
 CATALOGS =  ca.gmo de.gmo el.gmo eu.gmo fr.gmo hu.gmo ja.gmo ko.gmo lt.gmo no.gmo pl.gmo ru.gmo uk.gmo vi.gmo
 CATOBJEXT = .gmo
 CC = gcc
@@ -136,15 +136,15 @@
 LDFLAGS = 
 LIBOBJS = 
 LIBS =  
-LIBXFCE4PANEL_CFLAGS = -DXTHREADS -I/usr/local/include/xfce4/ -I/usr/local/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/atk-1.0  
-LIBXFCE4PANEL_LIBS = -L/usr/local/lib -L/usr/X11R6/lib -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+LIBXFCE4PANEL_CFLAGS = -DXTHREADS -I/usr/local/include/xfce4/ -I/usr/X11R6/include -I/usr/local/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/atk-1.0  
+LIBXFCE4PANEL_LIBS = -L/usr/local/lib -L/usr/X11R6/lib -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -lXrandr -lXi -lXinerama -lXext -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXcursor -lpango-1.0 -lcairo -lXrender -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 LIBXFCE4PANEL_REQUIRED_VERSION = 4.3.20
 LIBXFCE4PANEL_VERSION = 4.3.90.2
 LTLIBOBJS = 
 MAINT = 
 MAINTAINER_MODE_FALSE = #
 MAINTAINER_MODE_TRUE = 
-MAKEINFO = ${SHELL} /home/tim/mount-plugin.berlios/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/tim/xfce4-mount-plugin/missing --run makeinfo
 MKINSTALLDIRS = ./mkinstalldirs
 MSGFMT = /usr/bin/msgfmt
 NO_PREFIX_PACKAGE_DATA_DIR = share
@@ -190,7 +190,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/tim/mount-plugin.berlios/install-sh
+install_sh = /home/tim/xfce4-mount-plugin/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -215,11 +215,11 @@
 
 xfce4_mount_plugin_CFLAGS = \
 	     -DPACKAGE_LOCALE_DIR=\"$(localedir)\"               \
-	     -DXTHREADS -I/usr/local/include/xfce4/ -I/usr/local/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairo -I/usr/include/atk-1.0  
+	     -DXTHREADS -I/usr/local/include/xfce4/ -I/usr/X11R6/include -I/usr/local/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/atk-1.0  
 
 xfce4_mount_plugin_LDFLAGS = \
                                            			\
-	     -L/usr/local/lib -L/usr/X11R6/lib -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+	     -L/usr/local/lib -L/usr/X11R6/lib -lxfce4panel -lxfcegui4 -lgtk-x11-2.0 -lxfce4util -lgdk-x11-2.0 -lXrandr -lXi -lXinerama -lXext -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXcursor -lpango-1.0 -lcairo -lXrender -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 
 
 # .desktop file

Modified: xfce4-mount-plugin/trunk/panel-plugin/Makefile.in
===================================================================
--- xfce4-mount-plugin/trunk/panel-plugin/Makefile.in	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/panel-plugin/Makefile.in	2006-07-07 19:03:37 UTC (rev 1474)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(xfce4_mount_plugin_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -75,6 +73,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -101,6 +100,7 @@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -123,6 +123,7 @@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
 INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
 INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
 INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
 INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
@@ -144,11 +145,14 @@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
 OBJEXT = @OBJEXT@
 OS = @OS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -168,7 +172,6 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -179,8 +182,12 @@
 bindir = @bindir@
 build_alias = @build_alias@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -191,8 +198,10 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@

Modified: xfce4-mount-plugin/trunk/po/Makefile.in
===================================================================
--- xfce4-mount-plugin/trunk/po/Makefile.in	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/Makefile.in	2006-07-07 19:03:37 UTC (rev 1474)
@@ -19,11 +19,10 @@
 
 GETTEXT_PACKAGE = xfce4-mount-plugin
 PACKAGE = xfce4-mount-plugin
-VERSION = 0.4.6
+VERSION = 0.4.7
 
 SHELL = /bin/sh
 
-
 srcdir = .
 top_srcdir = ..
 top_builddir = ..
@@ -31,22 +30,20 @@
 
 prefix = /usr/local
 exec_prefix = ${prefix}
-datadir = ${prefix}/share
-datarootdir = @datarootdir@
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
 libdir = ${exec_prefix}/lib
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = share
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
 subdir = po
-install_sh = /home/tim/tmp/mount-plugin/install-sh
-# Automake >= 1.8 provides mkdir -p -- ..
+install_sh = /home/tim/xfce4-mount-plugin/install-sh
+# Automake >= 1.8 provides mkdir -p --.
 # Until it can be supposed, use the safe fallback:
 mkdir_p = $(install_sh) -d
 
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 
-CC = gcc
 GMSGFMT = /usr/bin/msgfmt
 MSGFMT = /usr/bin/msgfmt
 XGETTEXT_ARGS = --keyword=Q_
@@ -56,32 +53,23 @@
 MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
 GENPOT   = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
-DEFS = -DHAVE_CONFIG_H
-CFLAGS = -g -O2
-CPPFLAGS = 
+ALL_LINGUAS = ca de el eu fr hu ja ko lt no pl ru uk vi
 
-INCLUDES = -I.. -I$(top_srcdir)/intl
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-SOURCES = 
-POFILES =  de.po el.po eu.po fr.po hu.po ko.po lt.po ru.po uk.po vi.po
-GMOFILES =  de.gmo el.gmo eu.gmo fr.gmo hu.gmo ko.gmo lt.gmo ru.gmo uk.gmo vi.gmo
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(SOURCES)
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
 EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
+#This Gets Replace for some reason
 
-CATALOGS =  de.gmo el.gmo eu.gmo fr.gmo hu.gmo ko.gmo lt.gmo ru.gmo uk.gmo vi.gmo
-CATOBJEXT = .gmo
+CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
 
 .SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
 
-.c.o:
-	$(COMPILE) $<
-
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
@@ -106,76 +94,63 @@
 $(GETTEXT_PACKAGE).pot: $(POTFILES)
 	$(GENPOT)
 
-install: install-exec install-data
-install-exec:
+install: install-data
 install-data: install-data-yes
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+	$(mkdir_p) $(DESTDIR)$(itlocaledir)
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$cat as" \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
 		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
 	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
 		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$cat as" \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
 		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	    else \
 	      true; \
 	    fi; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
 
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
+
 # Define this as empty until I found a useful application.
 installcheck:
 
 uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
 
 check: all $(GETTEXT_PACKAGE).pot
 
-dvi info tags TAGS ID:
-
 mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -fr *.o
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
 	rm -f .intltool-merge-cache
 
 clean: mostlyclean
@@ -189,7 +164,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f Makefile.in.in
 
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	extra_dists="$(EXTRA_DISTFILES)"; \
@@ -205,10 +180,12 @@
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
 	  echo "$$lang:"; \
 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
 	  if $$result; then \
@@ -224,7 +201,7 @@
 	      fi; \
 	    fi; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
+	    echo "msgmerge for $$lang.gmo failed!"; \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  fi; \
 	done

Modified: xfce4-mount-plugin/trunk/po/Makefile.in.in
===================================================================
--- xfce4-mount-plugin/trunk/po/Makefile.in.in	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/Makefile.in.in	2006-07-07 19:03:37 UTC (rev 1474)
@@ -11,13 +11,17 @@
 #
 # - Modified by jacob berkman <jacob at ximian.com> to install
 #   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
 
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 SHELL = /bin/sh
- at SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -27,20 +31,19 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
+datarootdir = @datarootdir@
 libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
 subdir = po
 install_sh = @install_sh@
-mkdir_p = @mkdir_p@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+# Automake >= 1.8 provides @mkdir_p at .
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-CC = @CC@
-GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT_ARGS = @XGETTEXT_ARGS@
@@ -50,35 +53,26 @@
 MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
 GENPOT   = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
 
-INCLUDES = -I.. -I$(top_srcdir)/intl
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(GMOFILES) $(SOURCES)
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
+#This Gets Replace for some reason
 
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
+CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
 
 .SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
 
-.c.o:
-	$(COMPILE) $<
-
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(top_builddir)/po/$(GETTEXT_PACKAGE).pot -o $*pox
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
 	$(MSGFMT) -o $@ $<
@@ -89,7 +83,7 @@
 
 .po.cat:
 	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
+	  && rm -f $@ && gencat $@ $*.msg
 
 
 all: all- at USE_NLS@
@@ -100,115 +94,98 @@
 $(GETTEXT_PACKAGE).pot: $(POTFILES)
 	$(GENPOT)
 
-install: install-exec install-data
-install-exec:
+install: install-data
 install-data: install-data- at USE_NLS@
 install-data-no: all
 install-data-yes: all
-	if test -n "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+	$(mkdir_p) $(DESTDIR)$(itlocaledir)
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
 	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
 	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	    else \
 	      true; \
 	    fi; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
 
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
+
 # Define this as empty until I found a useful application.
 installcheck:
 
 uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
 
-check: all
+check: all $(GETTEXT_PACKAGE).pot
 
-dvi info tags TAGS ID:
-
 mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -fr *.o
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
 	rm -f .intltool-merge-cache
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
+	rm -f Makefile.in.in
 
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES) $(GETTEXT_PACKAGE).pot
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
 	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
 	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
 	done
 
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
 	  echo "$$lang:"; \
 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
 	  if $$result; then \
@@ -224,32 +201,20 @@
 	      fi; \
 	    fi; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
+	    echo "msgmerge for $$lang.gmo failed!"; \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  fi; \
 	done
 
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' 						\
-		    -e "s/^\[.*\] +//" 					\
-		    -e '/^[ 	]*$$/d' 				\
-		    -e "s at .*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
 
-Makefile: Makefile.in.in ../config.status POTFILES
+stamp-it: Makefile.in.in ../config.status POTFILES.in
 	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
 	       $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.

Modified: xfce4-mount-plugin/trunk/po/ca.po
===================================================================
--- xfce4-mount-plugin/trunk/po/ca.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/ca.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-04-17 21:07+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: catalan\n"
@@ -20,109 +20,116 @@
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f B"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "mida: %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "espai en ús: %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "espai disponible: %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "percentatge d'ús: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "Sistema de fitxers: %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "punt de muntatge actual: %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "disc: %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "punt de muntatge: %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "no muntat\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 #, fuzzy
 msgid "Mount Plugin: Error executing command."
 msgstr "Connector per muntar: Error al executar l'ordre."
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "El dispositiu «%s» ja es pot extreure de forma segura."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "Error: El dispositiu no s'ha d'extreure!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">no muntat</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "dispositius"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Edita les propietats"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Dispositius muntables"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Executa després de muntar:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -132,11 +139,11 @@
 "muntatge com argument.\n"
 "Si no sabeu que posar podeu provar amb «xffm», «rox» o «thunar»."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Especifiqueu ordres propies"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -144,20 +151,16 @@
 "ADVERTÈNCIA: Aquestes opcions són per usuaris experts.  Si no sabeu per què "
 "són millor que no les toqueu."
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Ordre de muntatge:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Ordre per desmuntar:"
 
 # Traduit "unmount" per «umount», s'hauria de comprovar.
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 #, fuzzy
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
@@ -166,12 +169,20 @@
 "Molts usuaris només voldran afegir-li al inici «sudo» a amb dos ordres o "
 "«sync &&» a l'ordre «umount»."
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Mostra els missatges després de desmuntar"
 
 # Traduit "unmount" per «umount», s'hauria de comprovar.
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 #, fuzzy
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
@@ -180,18 +191,30 @@
 "Això només és útil i recomanable si heu especificat «sync» com part de "
 "l'ordre «umount»."
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 #, fuzzy
 msgid "Also display network file systems"
 msgstr "Mostra també el sistema de fitxers de xarxa."
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 "Activeu aquesta opció per veure xarxes de l'estil de NFS, SBMFS, SHFS i SSHFS"
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 #, fuzzy
 msgid "Shows all mountable devices and (un)mounts them on request."

Modified: xfce4-mount-plugin/trunk/po/de.po
===================================================================
--- xfce4-mount-plugin/trunk/po/de.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/de.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-02-19 19:13+0100\n"
 "Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
 "Language-Team: German <de at li.org>\n"
@@ -17,108 +17,115 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f B"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MBytes"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "Größe: %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "Verwendeter Platz: %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "Verfügbarer Platz: %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "Verwendeter Anteil: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "Dateisystemtyp: %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "Eigentlicher Einhängepunkt: %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "Platte: %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "Einhängepunkt: %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "nicht eingehängt\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr "Mount Plugin: Fehler beim Ausführen des Befehls."
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "Das Gerät \"%s\" sollte sich jetzt sicher entfernen lassen."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "Ein Fehler hat sich ereignet. Das Gerät sollte nicht entfernt werden!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">nicht eingehängt</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "Geräte"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Eigenschaften ändern"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Geräte einhängen"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr "Befehle"
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr "<b>Befehle</b>"
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Nach dem Einhängen ausführen:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -129,11 +136,11 @@
 "Falls du unsicher bist, was eingetragen werden kann, probier doch mal \"xffm"
 "\" oder \"rox\" oder \"thunar\"."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Eigene Befehle angeben"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -141,19 +148,15 @@
 "ACHTUNG: Diese Optionen sind nur für Experten gedacht. Falls du nicht weißt, "
 "wozu sie gut sein sollen, lass deine Hände von ihnen weg!"
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Befehl zum Einhängen:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Befehl zum Aushängen:"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
@@ -161,11 +164,19 @@
 "Die meisten Nutzer wollen nur ein \"sudo\" vor beide Befehle oder \"sync &&"
 "\" vor den \"unmount\"-Befehl hängen."
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr "<b>Allgemein</b>"
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr "Allgemein"
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Zeige Nachricht nach Aushängen"
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
@@ -173,11 +184,11 @@
 "Dies ist nur sinnvoll und empfohlen, falls \"sync\" als Teil des \"unmount\"-"
 "Befehls angegeben wird."
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr "Netzwerkdateisysteme ebenfalls anzeigen"
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
@@ -185,6 +196,20 @@
 "Dies Option verwenden, um auch Netzwerkdateisysteme wie NFS, SMBFS, SHFS und "
 "SSHFS anzuzeigen."
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+"Hier kann ein bestimmtes Symbol angegeben werden, das in der Leiste "
+"angezeigt werden soll."
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr "Symbol:"
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr "Bild wählen"
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr "Zeigt alle einhängbaren Geräte an und hängt sie bei Mausklick ein/aus."

Modified: xfce4-mount-plugin/trunk/po/el.po
===================================================================
--- xfce4-mount-plugin/trunk/po/el.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/el.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-04-07 23:36+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002 at freemail.gr>\n"
 "Language-Team: Greek <el at li.org>\n"
@@ -19,109 +19,116 @@
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f B"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "μέγεθος: %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "κατειλημμένο: %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "διαθέσιμο: %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "ποσοστό σε χρήση: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "τύπος συστήματος αρχείων: %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "σημείο σύνδεσης: %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "δίσκος: %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "σημείο προσάρτητης : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "μη προσαρτημένο\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr ""
 "Προέκυψε ένα σφάλμα κατά την εκτέλεση επιλεγμένης εντολής του mount plugin.."
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "Η συσκευή \"%s\" μπορεί να αφαιρεθεί με ασφάλεια."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "Προέκυψε ένα σφάλμα. Η συσκευή δεν πρέπει να αφαιρεθεί!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">μη προσαρτημένο</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "συσκευές"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Επεξεργασία ιδιοτήτων"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Προσάρτηση συσκευών"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Εκτέλεση μετά την προσάρτηση:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -131,39 +138,43 @@
 "σύνδεσης ως όρισμα.\n"
 "Εάν δεν είστε σίγουροι, δοκιμάστε με \"xffm\" ή \"rox\" ή \"thunar\"."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Ορισμός προσαρμοσμένων εντολών"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
 msgstr ""
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Εντολή προσάρτησης:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Εντολή αποπροσάρτησης:"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Προβολή μηνύματος μετά την αποπροσάρτηση"
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
@@ -171,11 +182,11 @@
 "Αυτό είναι χρήσιμο και συνιστάται μόνο αν έχετε το \"sync\" ως μέρος της "
 "εντολής αποπροσάρτησης."
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr "Προβολή δικτυακών συστημάτων αρχείων"
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
@@ -183,6 +194,18 @@
 "Με αυτή την επιλογή εμφανίζονται και τα συστήματα αρχείων δικτύου όπως NFS. "
 "SMBFS, SHFS και SSHFS."
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""

Modified: xfce4-mount-plugin/trunk/po/eu.po
===================================================================
--- xfce4-mount-plugin/trunk/po/eu.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/eu.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-04-20 22:26+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -18,108 +18,115 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f B"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "tamaina : %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "tamaina erabilia : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "tamaina erabilgarria : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "ehuneko erabilia: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "fitxategi sistema mota : %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "erabilitako muntatze puntua : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "diskoa : %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "muntatze puntua : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "ez muntaturik\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr "Muntatze Plugin-a: Errorea komadoa abiaraztean."
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "\"%s\" gailua orain ziurtasunez deskonektatu daiteke."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "Errore bat gertatu da. Gailua ezin da ezabatu!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">ez muntaturik</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "gailuak"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Propietateak Editatu"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Gailuak muntatu"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Munatze ondoren exekutatu:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -129,11 +136,11 @@
 "abiaraziko da.\n"
 "Zer ipini ziur ez badakizu probatu, \"xffm\" edo \"rox\" edo \"thunar\"."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Komando pertsonalizatuak ezarri"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -141,31 +148,35 @@
 "ABISUA: Aukera hauek erabiltzaile aurreratuentzat bakarrik dira! Zer ipini "
 "ez badakizu mantendu zure eskuak hemendik kanpo!"
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Munatze komandoa:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Desmuntatze komandoa:"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr ""
-"Erabiltzaile gehienek \"sudo\" beharko dute bi komandoentzat, edo \"sync &&\" "
-"gehitu aurretik \"unmount\" komandoari."
+"Erabiltzaile gehienek \"sudo\" beharko dute bi komandoentzat, edo \"sync &&"
+"\" gehitu aurretik \"unmount\" komandoari."
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Bistarazi mezua desmuntatu ostean"
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
@@ -173,11 +184,11 @@
 "Hau erabilgarri eta gomendagarria da \"sync\" erabiltzen bauduzu \"unmount\" "
 "komandoarekin."
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr "Sare fitxategi sistemak ere bistarazi"
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
@@ -185,7 +196,18 @@
 "Aukera hau gaitu sNFS, SMBF, SHFS eta SSHFS antzerko sare bidezko fitxategi "
 "sistemak ere bistaratzeko."
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr "Gailu muntagarri gustiak bistarazi eta eskatzean (des)muntatu."
-

Modified: xfce4-mount-plugin/trunk/po/fr.po
===================================================================
--- xfce4-mount-plugin/trunk/po/fr.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/fr.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-03-02 16:08+0100\n"
 "Last-Translator: Stephane Roy <sroy at j2n.net>\n"
 "Language-Team: French <traduc at traduc.org>\n"
@@ -18,108 +18,115 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f o"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f Ko"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f Mo"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f Go"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "espace : %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "espace utilisé : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "espace libre : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "pourcentage utilisé : %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "type du système de fichier : %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "point de montage actuel : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "disque : %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "point de montage : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "non monté\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr "Greffon de montage : erreur en exécutant la commande."
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "Le périphérique \"%s\" peut maintenant être supprimé de manière sûre."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\">non monté</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "périphériques"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Éditer les propriétés"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Monter les périphériques"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Exécuter avec le montage :"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -130,11 +137,11 @@
 "Si vous n'êtes pas sûr de ce qu'il faut mettre, essayez d'utiliser \"xffm\" "
 "ou \"rox\" ou \"thunar\"."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Préciser vos propres commandes"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -142,19 +149,15 @@
 "ATTENTION : ces options sont réservés aux experts ! Si vous ne savez pas à "
 "quoi elle peuvent bien servir, laissez vos mains ailleurs !"
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Commande de montage :"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Commande de démontage :"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
@@ -162,11 +165,19 @@
 "La plupart des utilisateurs veulent seulement faire précéder les commandes "
 "par \"sudo\" ou la commande \"unmount\" par \"sync\"."
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Monter un message après le démontage"
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
@@ -174,16 +185,28 @@
 "Ceci est utile et recommandé uniquement si vous spécifiez \"sync\" dans la "
 "ligne de commande de \"unmount\"."
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""

Modified: xfce4-mount-plugin/trunk/po/hu.po
===================================================================
--- xfce4-mount-plugin/trunk/po/hu.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/hu.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-03-20 03:19+0100\n"
 "Last-Translator: SZERVÑC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -17,108 +17,115 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f B"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "méret : %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "használt : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "elérhető méret : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "használt százalék: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "fájlrendszer típus : %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "jelen csatolási pont : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "lemez : %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "csatolási pont : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "nincs csatolva\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr "Hiba a parancs futtatásakor"
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "A \"%s\" eszköz biztonságosan eltávolítható."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "Hiba történt. Az eszközt nem lehet eltávolítani!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">nincs csatolva</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "eszközök"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Tulajdonságok"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Eszközök csatolása"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Csatolás után fut:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -128,11 +135,11 @@
 "argumentumként átadva. \n"
 "Jó tippek: \"xffm\", \"thunar\" vagy \"rox\"."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Saját parancs megadása"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -140,19 +147,15 @@
 "FIGYELEM: E lehetőséges csak szakértőknek valók! Ha nem tudod, mire jók, ne "
 "módosítsd!"
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Csatoló parancs:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Lecsatoló parancs:"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
@@ -160,28 +163,48 @@
 "A legtöbb felhasználó csak \"sudo\"-t akar mindkét parancs, vagy \"sync &&\"-"
 "t az \"unmount\" parancs elé."
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Üzenet mutatása lecsatolás után"
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr ""
 "Ez csak akkor ajánlott, ha megadod a \"sync\"-et az \"unmount\" prancsban."
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr "Hálózati fájlrendszereket is kiír."
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 "E lehetőség az NFS, SMBFS, SHFS, SSHFS, stb. fájlrendszereket is kiírja."
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr "Minden csatolható eszközt mutat és kérésre (le)csatolja őket"

Modified: xfce4-mount-plugin/trunk/po/ja.po
===================================================================
--- xfce4-mount-plugin/trunk/po/ja.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/ja.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-04-02 20:42+0900\n"
 "Last-Translator: Daichi Kawahata <daichi at xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -20,108 +20,115 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1fバイト"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1fキロバイト"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1fメガバイト"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1fギガバイト"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "サイズ : %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "使用済み : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "使用可能 : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "使用率 : %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "ファイルシステム : %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "実際のマウント場所 : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "ディスク : %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "マウント場所 : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "マウントされていません\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr "マウントプラグイン: コマンドの実行中にエラーが発生しました。"
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "デバイス「%s」を取り外す用意が整いました。"
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "エラーが発生しました。デバイスを取り外してはいけません!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">マウントされていません</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "デバイス"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "プロパティの編集"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "マウントデバイス"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "マウント後に実行:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -132,11 +139,11 @@
 "何を入力するか分からないのでしたら、「xffm」,「rox」または「thunar」を試して"
 "みて下さい。"
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "その他のコマンドを指定"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -144,19 +151,15 @@
 "警告: これらのオプションは上級者専用です! これらが何を意味するのか分からない"
 "のでしたら、決していじらないで下さい!"
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "マウントコマンド:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "マウント解除コマンド:"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
@@ -164,11 +167,19 @@
 "大半のユーザーは両コマンドの先頭に「sudo」を付けるか、「unmount」コマンドの先"
 "頭に「sync &&」を付けるだけでよいと思います。"
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "マウント解除後にメッセージを表示する"
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
@@ -176,11 +187,11 @@
 "このオプションは「unmount」コマンド文字列に「sync」を入れている場合にお勧めし"
 "ます。"
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr "ネットワーク・ファイルシステムも表示する"
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
@@ -188,6 +199,18 @@
 "このオプションを有効にすると NFS, SMBFS, SHFS および SSHFS のようなネットワー"
 "ク・ファイルシステムも表示します。"
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""

Modified: xfce4-mount-plugin/trunk/po/ko.po
===================================================================
--- xfce4-mount-plugin/trunk/po/ko.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/ko.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-01-04 21:38+0900\n"
 "Last-Translator: ByungHyun Choi <byunghyun.choi at gmail.com>\n"
 "Language-Team: Korean <xfce4-users-kr-i18n at lists.sourceforge.net>\n"
@@ -17,163 +17,186 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr ""
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 #, fuzzy
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>센서</b></span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr ""
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
 "If you are unsure what to insert, try \"xffm\" or \"rox\" or \"thunar\"."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
 msgstr ""
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""

Modified: xfce4-mount-plugin/trunk/po/lt.po
===================================================================
--- xfce4-mount-plugin/trunk/po/lt.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/lt.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-01-04 21:39+0900\n"
 "Last-Translator: Rimas Kudelis <rq at akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -17,163 +17,186 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr ""
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 #, fuzzy
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoriai</b></span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr ""
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
 "If you are unsure what to insert, try \"xffm\" or \"rox\" or \"thunar\"."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
 msgstr ""
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""

Modified: xfce4-mount-plugin/trunk/po/no.po
===================================================================
--- xfce4-mount-plugin/trunk/po/no.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/no.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-02 17:41+0200\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-06-22 00:00+0200\n"
 "Last-Translator: Jon Kristian Nilsen <jonn3 at broadpark.no>\n"
 "Language-Team: NORWEGIAN <no at li.org>\n"
@@ -86,47 +86,46 @@
 msgid "Mount Plugin: Error executing command."
 msgstr "Mount Plugin: Feil ved utføring av kommando."
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "Enheten \"%s\" kan trygt fjernes."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "En feil oppstod. Enheten må ikke fjernes!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">ikke montert</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:439
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "enheter"
 
-#: ../panel-plugin/mount-plugin.c:569
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Editer Oppsett"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:576
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Monteringsenheter"
 
-#: ../panel-plugin/mount-plugin.c:606
+#: ../panel-plugin/mount-plugin.c:615
 msgid "Commands"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:619
+#: ../panel-plugin/mount-plugin.c:629
 msgid "<b>Commands</b>"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:631
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Kjør etter montering:"
 
-#: ../panel-plugin/mount-plugin.c:638
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
@@ -136,11 +135,11 @@
 "Hvis du er usikker på hva du vil sette inn, prøv \"xffm\" , \"rox\" eller "
 "\"thunar\"."
 
-#: ../panel-plugin/mount-plugin.c:664
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Angi egne kommandoer"
 
-#: ../panel-plugin/mount-plugin.c:675
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -148,19 +147,15 @@
 "ADVARSEL: Disse valgene er kun for eksperter! Hvis du ikke vet hva de "
 "innebærer så kan det være lurt å finne ut av det før du prøver."
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:692
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Monteringskommando:"
 
-#: ../panel-plugin/mount-plugin.c:699
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Avmonteringskommando:"
 
-#: ../panel-plugin/mount-plugin.c:722
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
@@ -168,19 +163,19 @@
 "De fleste brukere har mulighet til å kjøre \"sudo\" foran begge kommandoer, "
 "eller \"sync &&\" foran \"avmonteringskommandoen\"."
 
-#: ../panel-plugin/mount-plugin.c:740
+#: ../panel-plugin/mount-plugin.c:746
 msgid "<b>General</b>"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:743
+#: ../panel-plugin/mount-plugin.c:749
 msgid "General"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:759
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Vis melding etter avmontering"
 
-#: ../panel-plugin/mount-plugin.c:765
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
@@ -188,11 +183,11 @@
 "Dette valget er kun å anbefale hvis du har angitt \"sync\" som en del av "
 "\"avmonteringskommandoen\"."
 
-#: ../panel-plugin/mount-plugin.c:778
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr "Vis også filsystemer i nettverket"
 
-#: ../panel-plugin/mount-plugin.c:784
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
@@ -200,15 +195,15 @@
 "Aktiver dette valget for også å vise filsystem som ligger i nettverket, f."
 "eks. NFS, SMBFS, SHFS og SSHFS."
 
-#: ../panel-plugin/mount-plugin.c:795
+#: ../panel-plugin/mount-plugin.c:802
 msgid "You can specify a distinct icon to be displayed in the panel."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:802
+#: ../panel-plugin/mount-plugin.c:809
 msgid "Icon:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:806
+#: ../panel-plugin/mount-plugin.c:813
 msgid "Select an image"
 msgstr ""
 

Modified: xfce4-mount-plugin/trunk/po/pl.po
===================================================================
--- xfce4-mount-plugin/trunk/po/pl.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/pl.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-04-08 13:09+0900\n"
 "Last-Translator: Piotr Maliński <admin at rk.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -17,139 +17,143 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%1f B"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "rozmiar : %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "używane : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "dostępne : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "procent wykorzystania: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "system plików : %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "punkt montowania : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "dysk : %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "punkt montowania: %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "nie zamontowane\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr "Monter: Błąd wykonywania polecenia"
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "Urządzenie \"%s\"  można już bezpiecznie usunąć."
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr "Wystąpił błąd. Nie usuwaj urządzenia!"
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">nie zamontowane</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "urządzenia"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Edytuj Właściwości"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Zamontuj urządzenia"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Wykonaj po zamontowaniu:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
 "If you are unsure what to insert, try \"xffm\" or \"rox\" or \"thunar\"."
 msgstr ""
-"Polecenie zostanie wykonane po zamontowaniu zasobu w podanym punkcie montowania.\n"
+"Polecenie zostanie wykonane po zamontowaniu zasobu w podanym punkcie "
+"montowania.\n"
 "Możesz np. wpisać 'thunar' by uruchomić menadżera plików."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Podaj własne polecenia"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
 msgstr "UWAGA: Te opcje są tylko dla ekspertów!"
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Polecenie montowania:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Polecenie odmontowania:"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
@@ -157,26 +161,46 @@
 "W zależności od systemu/konfiguracji można dodać sudo do obu komend lub "
 "\"sync &&\" dla \"umount\"."
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr "Pokazuj komunikat po odmontowaniu"
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr "Ma sens jeżeli dodano \"sync\" do polecenia demontowania"
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr "Wyświetlaj również sieciowe systemy plików"
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr "Opcja ta umożliwia wyświetlanie zasobów NFS, SMBFS, SSHFS i innych."
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr "Pokazuje wszystkie montowalne zasoby i de/montuje je na rządanie."

Modified: xfce4-mount-plugin/trunk/po/ru.po
===================================================================
--- xfce4-mount-plugin/trunk/po/ru.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/ru.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-01-04 21:40+0900\n"
 "Last-Translator: Eugene Ostapets <eostapets at altlinux.ru>\n"
 "Language-Team: Russian <eostapets at altlinux.ru>\n"
@@ -20,164 +20,187 @@
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f Б"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f КБ"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f МБ"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f ГБ"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "размер : %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "использованный размер : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "доступный размер : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "процент использования: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "тип файловой системы : %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "текущая точка монтирования : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "диск: %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "точка монтирования : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "не смонтировано\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">не смонтировано</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "Устройства"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr ""
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 #, fuzzy
 msgid "Mount devices"
 msgstr "монтирование/отображение устройств"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 #, fuzzy
 msgid "Execute after mounting:"
 msgstr "команда исполняемая после монтирования устройства"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
 "If you are unsure what to insert, try \"xffm\" or \"rox\" or \"thunar\"."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
 msgstr ""
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""

Modified: xfce4-mount-plugin/trunk/po/uk.po
===================================================================
--- xfce4-mount-plugin/trunk/po/uk.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/uk.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-01-04 21:41+0900\n"
 "Last-Translator: Eugene Ostapets <eostapets at altlinux.ru>\n"
 "Language-Team: Ukainian <eostapets at altlinux.ru>\n"
@@ -20,164 +20,187 @@
 "X-Poedit-Country: UKRAINE\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f б"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f КБ"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f МБ"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f ГБ"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "розмір : %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "використаний розмір : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "доступний розмір : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "відсоток використання: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "тип файлової системи : %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "поточна точка монтування : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "диск : %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "точка монтування : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "не змонтовано\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">не змонтовано</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "пристрої"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr ""
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 #, fuzzy
 msgid "Mount devices"
 msgstr "монтування/відображення пристроїв"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 #, fuzzy
 msgid "Execute after mounting:"
 msgstr "команда, яка виконається після монтування пристрою"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
 "If you are unsure what to insert, try \"xffm\" or \"rox\" or \"thunar\"."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
 msgstr ""
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""

Modified: xfce4-mount-plugin/trunk/po/vi.po
===================================================================
--- xfce4-mount-plugin/trunk/po/vi.po	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/vi.po	2006-07-07 19:03:37 UTC (rev 1474)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: 2006-02-19 22:51+0300\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi at vnlinux.org>\n"
 "Language-Team: Vietnamese <none at li.org>\n"
@@ -15,108 +15,115 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr "%.1f B"
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr "kích thước: %g\n"
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr "sử dụng : %g\n"
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr "còn : %g\n"
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr "phần trăm đã dùng: %d\n"
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr "dạng hệ thống tập tin: %s\n"
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr "điểm gắn thật sự : %s\n"
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr "đĩa : %s\n"
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr "điểm gắn : %s\n"
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr "chưa gắn\n"
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr "Plugin gắn: Lỗi thực hiện câu lệnh."
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr "<span foreground=\"#FF0000\">chưa gắn</span>"
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr "thiết bị"
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr "Sửa thuộc tính"
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr "Thiết bị gắn"
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr "Lệnh chạy sau khi gắn:"
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 #, fuzzy
 msgid ""
 "This command will be executed after mounting the device with the mount point "
@@ -127,11 +134,11 @@
 "số. \n"
 "Nếu không biết điền gì, thì hãy thử \"xffm\" hoặc \"rox\" hoặc \"thunar\"."
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr "Chọn câu lệnh riêng"
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
@@ -139,45 +146,61 @@
 "CẢNH BÁO: Những tùy chọn này chỉ dành cho người dùng có kinh nghiệm! Nếu "
 "không biết rõ về chúng, xin đừng thay đổi gì!"
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr "Câu lệnh gắn:"
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr "Câu lệnh huỷ gắn:"
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 #, fuzzy
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr "Đa số người dùng chỉ cần thêm \"sudo\" vào trước cả hai câu lệnh."
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 #, fuzzy
 msgid "Shows all mountable devices and (un)mounts them on request."

Modified: xfce4-mount-plugin/trunk/po/xfce4-mount-plugin.pot
===================================================================
--- xfce4-mount-plugin/trunk/po/xfce4-mount-plugin.pot	2006-07-04 14:22:29 UTC (rev 1473)
+++ xfce4-mount-plugin/trunk/po/xfce4-mount-plugin.pot	2006-07-07 19:03:37 UTC (rev 1474)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 20:32+0900\n"
+"POT-Creation-Date: 2006-07-07 21:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,162 +16,185 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/devices.c:54
+#: ../panel-plugin/devices.c:52
 #, c-format
 msgid "%.1f B"
 msgstr ""
 
-#: ../panel-plugin/devices.c:55
+#: ../panel-plugin/devices.c:53
 #, c-format
 msgid "%.1f KB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:56
+#: ../panel-plugin/devices.c:54
 #, c-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:57
+#: ../panel-plugin/devices.c:55
 #, c-format
 msgid "%.1f GB"
 msgstr ""
 
-#: ../panel-plugin/devices.c:67
+#: ../panel-plugin/devices.c:65
 #, c-format
 msgid "size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:68
+#: ../panel-plugin/devices.c:66
 #, c-format
 msgid "used size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:69
+#: ../panel-plugin/devices.c:67
 #, c-format
 msgid "available size : %g\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:70
+#: ../panel-plugin/devices.c:68
 #, c-format
 msgid "percentage used: %d\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:71
+#: ../panel-plugin/devices.c:69
 #, c-format
 msgid "file system type : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:72
+#: ../panel-plugin/devices.c:70
 #, c-format
 msgid "actual mount point : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:159
+#: ../panel-plugin/devices.c:157
 #, c-format
 msgid "disk : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:160
+#: ../panel-plugin/devices.c:158
 #, c-format
 msgid "mount point : %s\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:164
+#: ../panel-plugin/devices.c:162
 #, c-format
 msgid "not mounted\n"
 msgstr ""
 
-#: ../panel-plugin/devices.c:227 ../panel-plugin/devices.c:274
+#: ../panel-plugin/devices.c:225 ../panel-plugin/devices.c:272
 msgid "Mount Plugin: Error executing command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:51
+#: ../panel-plugin/mount-plugin.c:50
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:54
+#: ../panel-plugin/mount-plugin.c:53
 msgid "An error occured. The device should not be removed!"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:176
+#: ../panel-plugin/mount-plugin.c:177
 msgid "<span foreground=\"#FF0000\">not mounted</span>"
 msgstr ""
 
-#. add_tooltip (GTK_WIDGET(mounter->button), _("devices"));
-#: ../panel-plugin/mount-plugin.c:417
+#: ../panel-plugin/mount-plugin.c:440
 msgid "devices"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:537
+#: ../panel-plugin/mount-plugin.c:575
 msgid "Edit Properties"
 msgstr ""
 
 #. end extensions for panel 4.4
-#: ../panel-plugin/mount-plugin.c:544
+#: ../panel-plugin/mount-plugin.c:582
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:1
 msgid "Mount devices"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:578
+#: ../panel-plugin/mount-plugin.c:615
+msgid "Commands"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:629
+msgid "<b>Commands</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:641
 msgid "Execute after mounting:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:585
+#: ../panel-plugin/mount-plugin.c:648
 msgid ""
 "This command will be executed after mounting the device with the mount point "
 "of the device as argument.\n"
 "If you are unsure what to insert, try \"xffm\" or \"rox\" or \"thunar\"."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:611
+#: ../panel-plugin/mount-plugin.c:674
 msgid "Specify own commands"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:622
+#: ../panel-plugin/mount-plugin.c:685
 msgid ""
 "WARNING: These options are for experts only! If you do not know what they "
 "may be good for, keep your hands off!"
 msgstr ""
 
-#. FIXME: labels are centered.
-#. gtk_label_set_justify does not work,
-#. adding alignment containers does not do s, either.
-#. so it must be something with the table: GTK_FILL doesn't do it.
-#: ../panel-plugin/mount-plugin.c:639
+#: ../panel-plugin/mount-plugin.c:698
 msgid "Mount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:646
+#: ../panel-plugin/mount-plugin.c:705
 msgid "Unmount command:"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:669
+#: ../panel-plugin/mount-plugin.c:728
 msgid ""
 "Most users will only want to prepend \"sudo\" to both commands or prepend "
 "\"sync &&\" to the \"unmount\" command."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:690
+#: ../panel-plugin/mount-plugin.c:746
+msgid "<b>General</b>"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:749
+msgid "General"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:766
 msgid "Show message after unmount"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:696
+#: ../panel-plugin/mount-plugin.c:772
 msgid ""
 "This is only useful and recommended if you specify \"sync\" as part of the "
 "\"unmount\" command string."
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:710
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Also display network file systems"
 msgstr ""
 
-#: ../panel-plugin/mount-plugin.c:716
+#: ../panel-plugin/mount-plugin.c:791
 msgid ""
 "Activate this option to also display network file systems like NFS, SMBFS, "
 "SHFS and SSHFS."
 msgstr ""
 
+#: ../panel-plugin/mount-plugin.c:802
+msgid "You can specify a distinct icon to be displayed in the panel."
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:809
+msgid "Icon:"
+msgstr ""
+
+#: ../panel-plugin/mount-plugin.c:813
+msgid "Select an image"
+msgstr ""
+
 #: ../panel-plugin/xfce4-mount-plugin.desktop.in.in.h:2
 msgid "Shows all mountable devices and (un)mounts them on request."
 msgstr ""




More information about the Goodies-commits mailing list