[SCM] easytag/master: Imported Upstream version 2.1.7

lucidfox-guest at users.alioth.debian.org lucidfox-guest at users.alioth.debian.org
Mon Apr 9 05:08:13 UTC 2012


The following commit has been merged in the master branch:
commit eb4e91597ec50c7ce59e08fb5875f5a18cd199b7
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Mon Apr 9 11:14:33 2012 +0700

    Imported Upstream version 2.1.7

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7800574..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-# ignore file
-*.o
-m4/*
-src/easytag
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.h
-config.h.in
-config.log
-config.status
-configure
-doc/easytag.1
-libtool
-ltmain.sh
-po/Makefile
-po/Makefile.in
-po/POTFILES
-src/.deps/
-src/Makefile
-src/Makefile.in
-src/easytag
-src/id3lib/.deps/
-src/id3lib/Makefile
-src/id3lib/Makefile.in
-src/id3lib/libid3bugfix.a
-src/libapetag/.deps/
-src/libapetag/Makefile
-src/libapetag/Makefile.in
-src/libapetag/libapetag.a
-src/libmpg123/.deps/
-src/libmpg123/Makefile
-src/libmpg123/Makefile.in
-src/libmpg123/libmpg123.a
-stamp-h1
diff --git a/ChangeLog b/ChangeLog
index 401fafd..3735d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2.1.7 - Jan 14th, 2012 :
+========================
+    * Gaute Amundsen's ConfirmWhenUnsavedFiles.patch
+    * Mark Ferry's albumartist patch for ogg and flac
+    * Götz Waschk's update for German translation
+    * Kip's optimized base64 decoder for album art
+    * Updated contributor credits
+    * Debianized
+    * Updated version to 2.1.7
+
 2.1.6 - July 12th, 2008 :
 =========================
     * Fixed displaying of the corresponding file when handling the Cddb track 
diff --git a/HACKING b/HACKING
deleted file mode 100644
index bcd5cad..0000000
--- a/HACKING
+++ /dev/null
@@ -1,45 +0,0 @@
-This version of EasyTag is maintained in a git repository on github as
-the project never had a publicly accessible version control
-repository. The initial repository was created from a number of
-publicly available tarballs. You can find the current state of the
-repository at:
-
-    https://github.com/stsquad/easytag
-
-It is intended as a place where patches and pull requests can be
-processed until Jérôme starts making releases again (hopefully with a
-public repo). In the meantime patches that look sane and don't crash
-EasyTag it will be accepted by myself.
-
-Contributing
-============
-
-My preferences for contributions are as follows:
-
-1. Pull request on github
-2. Pull request from another git repository
-3. Patches
-
-Patches are fine but GIT pull requests make it a lot easier to keep
-attribution correct and it makes my life easier ;-)
-
-Coding Style
-============
-
-I couldn't find any reference to the style to follow but running
-indent_finder.py suggests the code is currently:
-
-    No Tabs, Indent Level of 4 characters
-
-In Emacs the style can be set by the following:
-
-   (defconst easytag-c-style
-    '(
-       (indent-tabs-mode . nil)
-       (c-basic-offset . 4)
-       (c-comment-only-line-offset . 0))
-       "EasyTag Programming Style")
-
-       
-
-
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..a4755a9
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,1012 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/easytag.spec.in $(top_srcdir)/configure \
+	$(top_srcdir)/doc/easytag.1.in ABOUT-NLS COPYING ChangeLog \
+	INSTALL THANKS TODO config.guess config.sub depcomp install-sh \
+	ltmain.sh missing mkinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = easytag.spec doc/easytag.1
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(gnome_menudir)" \
+	"$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)" \
+	"$(DESTDIR)$(textdir)"
+NROFF = nroff
+MANS = $(man_MANS)
+DATA = $(gnome_menu_DATA) $(icon_DATA) $(pixmap_DATA) $(text_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = src po
+gnome_menudir = $(datadir)/applications
+gnome_menu_DATA = easytag.desktop
+textdir = $(datadir)/$(PACKAGE)
+text_DATA = ChangeLog
+man_MANS = doc/easytag.1
+BITMAPS = \
+    pixmaps/add_folder.xpm \
+    pixmaps/album.xpm \
+    pixmaps/all_downcase.xpm \
+    pixmaps/all_uppercase.xpm \
+    pixmaps/artist.xpm \
+    pixmaps/artist_album.xpm \
+    pixmaps/black.xpm \
+    pixmaps/blackwhite.xpm \
+    pixmaps/closed_folder_readonly.xpm \
+    pixmaps/closed_folder_unreadable.xpm \
+    pixmaps/closed_folder.xpm \
+    pixmaps/EasyTAG.ico \
+    pixmaps/EasyTAG_icon.xpm \
+    pixmaps/EasyTAG2.ico \
+    pixmaps/EasyTAG2.xpm \
+    pixmaps/first_letter_uppercase.xpm \
+    pixmaps/first_letter_uppercase_word.xpm \
+    pixmaps/forbidden.xpm \
+    pixmaps/freedb.xpm \
+    pixmaps/gnudb.xpm \
+    pixmaps/grab.xpm \
+    pixmaps/invert_selection.xpm \
+    pixmaps/mask.xpm \
+    pixmaps/musicbrainz.xpm \
+    pixmaps/opened_folder.xpm \
+    pixmaps/parent_folder.xpm \
+    pixmaps/ram_disk.xpm \
+    pixmaps/read_only.xpm \
+    pixmaps/red_lines.xpm \
+    pixmaps/scan.xpm \
+    pixmaps/select_all.xpm \
+    pixmaps/sequence_track.xpm \
+    pixmaps/sound.xpm \
+    pixmaps/unselect_all.xpm
+
+pixmapdir = $(datadir)/$(PACKAGE)
+pixmap_DATA = \
+    pixmaps/EasyTAG_logo.xpm
+
+#    pixmaps/artist_album.png \
+#    pixmaps/EasyTAG_icon.png \
+#    pixmaps/EasyTAG_logo.png \
+#    pixmaps/scan.png
+icondir = $(datadir)/pixmaps
+icon_DATA = pixmaps/EasyTAG_icon.xpm
+#icon_DATA = pixmaps/EasyTAG_icon.png
+EXTRA_DIST = \
+    $(gnome_menu_DATA) \
+    $(text_DATA) \
+    $(BITMAPS) \
+    $(pixmap_DATA) \
+    $(icon_DATA) \
+    \
+    autogen.sh \
+    easytag.spec \
+    easytag-win32-installer.nsi \
+    COPYING \
+    INSTALL \
+    README \
+    THANKS \
+    TODO \
+    USERS-GUIDE \
+    \
+    config.h.mingw \
+    Makefile.mingw \
+    README_win32.txt \
+    po/Makefile.mingw \
+    \
+    doc/easytag.1.in \
+    doc/EasyTAG_Documentation*.html \
+    doc/users_guide_*/* \
+    doc/users_guide_*/images/* \
+    doc/id3/* \
+    doc/vorbis/* 
+
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+easytag.spec: $(top_builddir)/config.status $(srcdir)/easytag.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+doc/easytag.1: $(top_builddir)/config.status $(top_srcdir)/doc/easytag.1.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+install-man1: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+install-gnome_menuDATA: $(gnome_menu_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(gnome_menudir)" || $(MKDIR_P) "$(DESTDIR)$(gnome_menudir)"
+	@list='$(gnome_menu_DATA)'; test -n "$(gnome_menudir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gnome_menudir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gnome_menudir)" || exit $$?; \
+	done
+
+uninstall-gnome_menuDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gnome_menu_DATA)'; test -n "$(gnome_menudir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gnome_menudir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gnome_menudir)" && rm -f $$files
+install-iconDATA: $(icon_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
+	done
+
+uninstall-iconDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(icondir)" && rm -f $$files
+install-pixmapDATA: $(pixmap_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
+	done
+
+uninstall-pixmapDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
+install-textDATA: $(text_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(textdir)" || $(MKDIR_P) "$(DESTDIR)$(textdir)"
+	@list='$(text_DATA)'; test -n "$(textdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(textdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(textdir)" || exit $$?; \
+	done
+
+uninstall-textDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(text_DATA)'; test -n "$(textdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(textdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(textdir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(MANS) $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(gnome_menudir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(textdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-gnome_menuDATA install-iconDATA install-man \
+	install-pixmapDATA install-textDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-gnome_menuDATA uninstall-iconDATA \
+	uninstall-man uninstall-pixmapDATA uninstall-textDATA
+
+uninstall-man: uninstall-man1
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-gnome_menuDATA install-html install-html-am \
+	install-iconDATA install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-pixmapDATA \
+	install-ps install-ps-am install-strip install-textDATA \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-gnome_menuDATA uninstall-iconDATA uninstall-man \
+	uninstall-man1 uninstall-pixmapDATA uninstall-textDATA
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..874cfaf
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,9969 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Configure paths for GLIB
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
+dnl gthread, or gio is specified in MODULES, pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GLIB_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  pkg_config_args=glib-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject) 
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+         gio*) 
+             pkg_config_args="$pkg_config_args $module-2.0"
+         ;;
+      esac
+  done
+
+  PKG_PROG_PKG_CONFIG([0.16])
+
+  no_glib=""
+
+  if test "x$PKG_CONFIG" = x ; then
+    no_glib=yes
+    PKG_CONFIG=no
+  fi
+
+  min_glib_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+	  enable_glibtest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+	  :
+    else
+	  no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.glibtest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  AC_SUBST(GLIB_GENMARSHAL)
+  AC_SUBST(GOBJECT_QUERY)
+  AC_SUBST(GLIB_MKENUMS)
+  rm -f conf.glibtest
+])
+
+# 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 !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 !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)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo at bar.xx>\n"
+"Language-Team: C <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
+	  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.ac.
+    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"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+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"
+datarootdir="$glib_save_datarootdir"
+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_ac,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
+# Configure paths for GTK+
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
+		    , enable_gtktest=yes)
+
+  pkg_config_args=gtk+-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+  if test x$PKG_CONFIG != xno ; then
+    if pkg-config --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
+
+  min_gtk_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+	  enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+	  :
+    else
+	  no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+	  ac_save_CFLAGS="$CFLAGS"
+	  ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+  ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool at gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+  lt_cl_success=:
+  test "$silent" = yes &&
+    lt_config_lt_args="$lt_config_lt_args --quiet"
+  exec AS_MESSAGE_LOG_FD>/dev/null
+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+  exec AS_MESSAGE_LOG_FD>>config.log
+  $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_XSI_SHELLFNS
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+[$]*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "[$]0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+    [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method == "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+  ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+        _LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+    [Fix the shell variable $srcfile for the compiler])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+        # as there is no search path for DLLs.
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+        _LT_TAGVAR(always_export_symbols, $1)=no
+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          _LT_TAGVAR(ld_shlibs, $1)=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[[12]]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 will use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  xl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='echo'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=echo
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='echo'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${F77-"f77"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${FC-"f95"}
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC="$lt_save_CC"
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $[*] ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]+=\$[2]"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+    ;;
+  esac
+])
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [0], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
+
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
+
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Generated from ltversion.in.
+
+# serial 3017 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.6b'
+macro_revision='1.3017'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
+
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 4 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 10
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 5
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 16
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..b786a4c
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,229 @@
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define for FLAC support */
+#undef ENABLE_FLAC
+
+/* Define for id3v23 support */
+#undef ENABLE_ID3LIB
+
+/* Define for MP3 support */
+#undef ENABLE_MP3
+
+/* Define for MP4 support */
+#undef ENABLE_MP4
+
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* Define for Ogg Vorbis support */
+#undef ENABLE_OGG
+
+/* Define for Speex support */
+#undef ENABLE_SPEEX
+
+/* Define for Wavpack support */
+#undef ENABLE_WAVPACK
+
+/* Package name for gettext */
+#undef GETTEXT_PACKAGE
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the `FLAC' library (-lFLAC). */
+#undef HAVE_LIBFLAC
+
+/* Define to 1 if you have the `id3tag' library (-lid3tag). */
+#undef HAVE_LIBID3TAG
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the `mp4v2' library (-lmp4v2). */
+#undef HAVE_LIBMP4V2
+
+/* Define to 1 if you have the `ogg' library (-logg). */
+#undef HAVE_LIBOGG
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
+/* Define to 1 if you have the `speex' library (-lspeex). */
+#undef HAVE_LIBSPEEX
+
+/* Define to 1 if you have the `vorbis' library (-lvorbis). */
+#undef HAVE_LIBVORBIS
+
+/* Define to 1 if you have the `vorbisfile' library (-lvorbisfile). */
+#undef HAVE_LIBVORBISFILE
+
+/* Define to 1 if you have the `wavpack' library (-lwavpack). */
+#undef HAVE_LIBWAVPACK
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkdir' function. */
+#undef HAVE_MKDIR
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+   zero-length file name argument. */
+#undef HAVE_STAT_EMPTY_STRING_BUG
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
+
+/* id3lib major version */
+#undef ID3LIB_MAJOR
+
+/* id3lib minor version */
+#undef ID3LIB_MINOR
+
+/* id3lib patch level */
+#undef ID3LIB_PATCH
+
+/* libflac major version */
+#undef LIBFLAC_MAJOR
+
+/* libflac minor version */
+#undef LIBFLAC_MINOR
+
+/* libflac patch version */
+#undef LIBFLAC_PATCH
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+   slash. */
+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Define for MP4 lib with multiple image support */
+#undef NEWMP4
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef mode_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
diff --git a/configure b/configure
new file mode 100755
index 0000000..2ae426d
--- /dev/null
+++ b/configure
@@ -0,0 +1,20927 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.67 for easytag 2.1.7.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+$*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='easytag'
+PACKAGE_TARNAME='easytag'
+PACKAGE_VERSION='2.1.7'
+PACKAGE_STRING='easytag 2.1.7'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+ac_unique_file="src/easytag.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+MKINSTALLDIRS
+POSUB
+POFILES
+PO_IN_DATADIR_FALSE
+PO_IN_DATADIR_TRUE
+INTLLIBS
+INSTOBJEXT
+GMOFILES
+DATADIRNAME
+CATOBJEXT
+CATALOGS
+XGETTEXT
+GMSGFMT
+MSGFMT_OPTS
+MSGFMT
+USE_NLS
+LIBOBJS
+WAVPACK_LIBS
+WAVPACK_CFLAGS
+VORBIS_LIBS
+VORBIS_CFLAGS
+OGG_LIBS
+OGG_CFLAGS
+GTK_LIBS
+GTK_CFLAGS
+GLIB_MKENUMS
+GOBJECT_QUERY
+GLIB_GENMARSHAL
+GLIB_LIBS
+GLIB_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+lt_ECHO
+RANLIB
+AR
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LIBTOOL
+CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+GETTEXT_PACKAGE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+enable_maintainer_mode
+enable_mp3
+enable_id3v23
+enable_ogg
+enable_speex
+enable_flac
+enable_mp4
+enable_wavpack
+enable_glibtest
+enable_gtktest
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+CPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+GTK_CFLAGS
+GTK_LIBS
+OGG_CFLAGS
+OGG_LIBS
+VORBIS_CFLAGS
+VORBIS_LIBS
+WAVPACK_CFLAGS
+WAVPACK_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures easytag 2.1.7 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/easytag]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of easytag 2.1.7:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-shared[=PKGS]  build shared libraries [default=no]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
+  --disable-mp3           Disable support for MP3 files (default=enabled)
+  --disable-id3v23        Disable support for writing id3v2.3 tags
+                          (default=enabled)
+  --disable-ogg           Disable support for Ogg Vorbis files
+                          (default=enabled)
+  --disable-speex         Disable support for Ogg Speex files
+                          (default=enabled)
+  --disable-flac          Disable support for FLAC files (default=enabled)
+  --disable-mp4           Disable support for MP4 files (default=enabled)
+  --disable-wavpack       Disable support for Wavpack files (default=enabled)
+  --disable-glibtest      do not try to compile and run a test GLIB program
+  --disable-gtktest       do not try to compile and run a test GTK+ program
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic              try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+  CPP         C preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
+  GTK_LIBS    linker flags for GTK, overriding pkg-config
+  OGG_CFLAGS  C compiler flags for OGG, overriding pkg-config
+  OGG_LIBS    linker flags for OGG, overriding pkg-config
+  VORBIS_CFLAGS
+              C compiler flags for VORBIS, overriding pkg-config
+  VORBIS_LIBS linker flags for VORBIS, overriding pkg-config
+  WAVPACK_CFLAGS
+              C compiler flags for WAVPACK, overriding pkg-config
+  WAVPACK_LIBS
+              linker flags for WAVPACK, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+easytag configure 2.1.7
+generated by GNU Autoconf 2.67
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by easytag $as_me 2.1.7, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+am__api_version='1.11'
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='easytag'
+ VERSION='2.1.7'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+
+ALL_LINGUAS="bg cs da de el es fr he hu it ja nl pl pt_BR ro ru sr sr at Latn sv uk zh_CN zh_TW"
+GETTEXT_PACKAGE=easytag
+
+
+cat >>confdefs.h <<_ACEOF
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+_ACEOF
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5 ; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=no
+fi
+
+
+
+
+
+
+
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6b'
+macro_revision='1.3017'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:5330: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:5333: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:5336: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line 6542 "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+_lt_caught_CXX_error=yes; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; pic_mode="$withval"
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:8564: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:8568: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:8903: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:8907: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:9008: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:9012: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:9063: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:9067: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	link_all_deplibs=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec='$convenience'
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  whole_archive_flag_spec=''
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo(void) {}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$save_LDFLAGS"
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11447 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11543 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' ${wl}-bernotok'
+	    allow_undefined_flag_CXX=' ${wl}-berok'
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec_CXX='$convenience'
+	    archive_cmds_need_lc_CXX=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+        # as there is no search path for DLLs.
+        hardcode_libdir_flag_spec_CXX='-L$libdir'
+        allow_undefined_flag_CXX=unsupported
+        always_export_symbols_CXX=no
+        enable_shared_with_static_runtimes_CXX=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          ld_shlibs_CXX=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  whole_archive_flag_spec_CXX=''
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[12]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 will use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  xl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='echo'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	ld_shlibs_CXX=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='${wl}-E'
+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=echo
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='echo'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='${wl}-z,text'
+	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+
+
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13499: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:13503: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13598: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:13602: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:13650: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:13654: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs_CXX=no
+  ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        then
+	  archive_cmds_need_lc_CXX=no
+        else
+	  archive_cmds_need_lc_CXX=yes
+        fi
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_strerror=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then :
+
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+
+case $host_os in
+  *mingw32* ) MINGW32=yes;;
+	  * ) MINGW32=no;;
+esac
+
+
+case $host_os in
+  *cygwin* ) CYGWIN=yes;;
+	 * ) CYGWIN=no;;
+esac
+
+
+# Check whether --enable-mp3 was given.
+if test "${enable_mp3+set}" = set; then :
+  enableval=$enable_mp3;
+else
+  enable_mp3=yes
+fi
+
+
+# Check whether --enable-id3v23 was given.
+if test "${enable_id3v23+set}" = set; then :
+  enableval=$enable_id3v23;
+else
+  enable_id3v23=yes
+fi
+
+
+# Check whether --enable-ogg was given.
+if test "${enable_ogg+set}" = set; then :
+  enableval=$enable_ogg;
+else
+  enable_ogg=yes
+fi
+
+
+# Check whether --enable-speex was given.
+if test "${enable_speex+set}" = set; then :
+  enableval=$enable_speex;
+else
+  enable_speex=yes
+fi
+
+
+# Check whether --enable-flac was given.
+if test "${enable_flac+set}" = set; then :
+  enableval=$enable_flac;
+else
+  enable_flac=yes
+fi
+
+
+# Check whether --enable-mp4 was given.
+if test "${enable_mp4+set}" = set; then :
+  enableval=$enable_mp4;
+else
+  enable_mp4=yes
+fi
+
+
+# Check whether --enable-wavpack was given.
+if test "${enable_wavpack+set}" = set; then :
+  enableval=$enable_wavpack;
+else
+  enable_wavpack=yes
+fi
+
+
+
+
+# Check whether --enable-glibtest was given.
+if test "${enable_glibtest+set}" = set; then :
+  enableval=$enable_glibtest;
+else
+  enable_glibtest=yes
+fi
+
+
+  pkg_config_args=glib-2.0
+  for module in .
+  do
+      case "$module" in
+         gmodule)
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export)
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject)
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread)
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+         gio*)
+             pkg_config_args="$pkg_config_args $module-2.0"
+         ;;
+      esac
+  done
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.16
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+  no_glib=""
+
+  if test "x$PKG_CONFIG" = x ; then
+    no_glib=yes
+    PKG_CONFIG=no
+  fi
+
+  min_glib_version=2.8.0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
+$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+	  enable_glibtest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+	  :
+    else
+	  no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+      rm -f conf.glibtest
+      if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.glibtest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    }
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  no_glib=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
+$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
+     :
+  else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <glib.h>
+#include <stdio.h>
+
+int
+main ()
+{
+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+else
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     as_fn_error $? "*** GLIB >= 2.8.0 not installed! ***" "$LINENO" 5
+  fi
+
+
+
+
+
+  rm -f conf.glibtest
+
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then :
+  enableval=$enable_gtktest;
+else
+  enable_gtktest=yes
+fi
+
+
+  pkg_config_args=gtk+-2.0
+  for module in .
+  do
+      case "$module" in
+         gthread)
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+  if test x$PKG_CONFIG != xno ; then
+    if pkg-config --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
+
+  min_gtk_version=2.12.0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
+$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+	  enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+	  :
+    else
+	  no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+      rm -f conf.gtktest
+      if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    }
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  no_gtk=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
+     :
+  else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+	  ac_save_CFLAGS="$CFLAGS"
+	  ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int
+main ()
+{
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+else
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     as_fn_error $? "*** GTK >= 2.12.0 not installed! ***" "$LINENO" 5
+  fi
+
+
+  rm -f conf.gtktest
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0" 2>&1`
+        else
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.8.0) were not met:
+
+$GTK_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+	GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recv in -lsocket" >&5
+$as_echo_n "checking for recv in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_recv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char recv ();
+int
+main ()
+{
+return recv ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_socket_recv=yes
+else
+  ac_cv_lib_socket_recv=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_recv" >&5
+$as_echo "$ac_cv_lib_socket_recv" >&6; }
+if test "x$ac_cv_lib_socket_recv" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSOCKET 1
+_ACEOF
+
+  LIBS="-lsocket $LIBS"
+
+fi
+
+
+
+
+if test "x$enable_ogg" = "xyes" -o "x$enable_flac" = "xyes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5
+$as_echo_n "checking for OGG... " >&6; }
+
+if test -n "$OGG_CFLAGS"; then
+    pkg_cv_OGG_CFLAGS="$OGG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$OGG_LIBS"; then
+    pkg_cv_OGG_LIBS="$OGG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg >= 1.0" 2>&1`
+        else
+	        OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg >= 1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$OGG_PKG_ERRORS" >&5
+
+	ogg_available=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	ogg_available=no
+else
+	OGG_CFLAGS=$pkg_cv_OGG_CFLAGS
+	OGG_LIBS=$pkg_cv_OGG_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+    if test "x$ogg_available" = "xno"; then
+        echo "***"
+        echo "*** Warning: libogg >= 1.0 needed"
+        echo "***"
+    fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
+$as_echo_n "checking for VORBIS... " >&6; }
+
+if test -n "$VORBIS_CFLAGS"; then
+    pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "vorbis >= 1.0.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "vorbis >= 1.0.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$VORBIS_LIBS"; then
+    pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "vorbis >= 1.0.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "vorbis >= 1.0.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vorbis >= 1.0.1" 2>&1`
+        else
+	        VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "vorbis >= 1.0.1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$VORBIS_PKG_ERRORS" >&5
+
+	ogg_available=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	ogg_available=no
+else
+	VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
+	VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+    if test "x$ogg_available" = "xno"; then
+        echo "***"
+        echo "*** Warning: libvorbis >= 1.0.1 needed"
+        echo "***"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_sync_init in -logg" >&5
+$as_echo_n "checking for ogg_sync_init in -logg... " >&6; }
+if test "${ac_cv_lib_ogg_ogg_sync_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-logg  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ogg_sync_init ();
+int
+main ()
+{
+return ogg_sync_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ogg_ogg_sync_init=yes
+else
+  ac_cv_lib_ogg_ogg_sync_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_sync_init" >&5
+$as_echo "$ac_cv_lib_ogg_ogg_sync_init" >&6; }
+if test "x$ac_cv_lib_ogg_ogg_sync_init" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBOGG 1
+_ACEOF
+
+  LIBS="-logg $LIBS"
+
+else
+  ogg_available=no
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_comment_init in -lvorbis" >&5
+$as_echo_n "checking for vorbis_comment_init in -lvorbis... " >&6; }
+if test "${ac_cv_lib_vorbis_vorbis_comment_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lvorbis  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char vorbis_comment_init ();
+int
+main ()
+{
+return vorbis_comment_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_vorbis_vorbis_comment_init=yes
+else
+  ac_cv_lib_vorbis_vorbis_comment_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_comment_init" >&5
+$as_echo "$ac_cv_lib_vorbis_vorbis_comment_init" >&6; }
+if test "x$ac_cv_lib_vorbis_vorbis_comment_init" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBVORBIS 1
+_ACEOF
+
+  LIBS="-lvorbis $LIBS"
+
+else
+  ogg_available=no
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ov_open in -lvorbisfile" >&5
+$as_echo_n "checking for ov_open in -lvorbisfile... " >&6; }
+if test "${ac_cv_lib_vorbisfile_ov_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lvorbisfile  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ov_open ();
+int
+main ()
+{
+return ov_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_vorbisfile_ov_open=yes
+else
+  ac_cv_lib_vorbisfile_ov_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_ov_open" >&5
+$as_echo "$ac_cv_lib_vorbisfile_ov_open" >&6; }
+if test "x$ac_cv_lib_vorbisfile_ov_open" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBVORBISFILE 1
+_ACEOF
+
+  LIBS="-lvorbisfile $LIBS"
+
+else
+  ogg_available=no
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ogg Vorbis file support" >&5
+$as_echo_n "checking for Ogg Vorbis file support... " >&6; }
+if test "x$enable_ogg" = "xyes"; then
+    if test "x$ogg_available" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_ogg="no"
+        echo "***"
+        echo "*** Warning: Ogg Vorbis file support disabled"
+        echo "*** (Install libogg and libvorbis libraries to enable it)"
+        echo "***"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_OGG 1" >>confdefs.h
+
+    fi
+else
+    echo "***"
+    echo "*** Ogg Vorbis file support disabled on commandline"
+    echo "*** (Install libogg and libvorbis libraries, and use --enable-ogg to enable it)"
+    echo "***"
+fi
+
+
+
+if test "x$enable_speex" = "xyes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_packet_to_header in -lspeex" >&5
+$as_echo_n "checking for speex_packet_to_header in -lspeex... " >&6; }
+if test "${ac_cv_lib_speex_speex_packet_to_header+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lspeex  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char speex_packet_to_header ();
+int
+main ()
+{
+return speex_packet_to_header ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_speex_speex_packet_to_header=yes
+else
+  ac_cv_lib_speex_speex_packet_to_header=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_packet_to_header" >&5
+$as_echo "$ac_cv_lib_speex_speex_packet_to_header" >&6; }
+if test "x$ac_cv_lib_speex_speex_packet_to_header" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSPEEX 1
+_ACEOF
+
+  LIBS="-lspeex $LIBS"
+
+else
+  speex_available=no
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Speex file support" >&5
+$as_echo_n "checking for Speex file support... " >&6; }
+    if test "x$speex_available" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_speex="no"
+        echo "***"
+        echo "*** Warning: Speex file support disabled, speex missing"
+        echo "*** (Install speex, libogg and libvorbis libraries to enable it)"
+        echo "***"
+    elif test "x$enable_ogg" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_speex="no"
+        echo "***"
+        echo "*** Warning: Speex file support disabled, libvorbis missing"
+        echo "*** (Install speex, libogg and libvorbis libraries to enable it)"
+        echo "***"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_SPEEX 1" >>confdefs.h
+
+    fi
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Speex file support" >&5
+$as_echo_n "checking for Speex file support... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    echo "***"
+    echo "*** Speex file support disabled on commandline"
+    echo "*** (Install speex, libogg and libvorbis libraries, and use --enable-speex to enable it)"
+    echo "***"
+fi
+
+
+
+if test "x$enable_flac" = "xyes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC__metadata_simple_iterator_new in -lFLAC" >&5
+$as_echo_n "checking for FLAC__metadata_simple_iterator_new in -lFLAC... " >&6; }
+if test "${ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lFLAC  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char FLAC__metadata_simple_iterator_new ();
+int
+main ()
+{
+return FLAC__metadata_simple_iterator_new ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new=yes
+else
+  ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new" >&5
+$as_echo "$ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new" >&6; }
+if test "x$ac_cv_lib_FLAC_FLAC__metadata_simple_iterator_new" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBFLAC 1
+_ACEOF
+
+  LIBS="-lFLAC $LIBS"
+
+else
+  flac_available=no
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC file support" >&5
+$as_echo_n "checking for FLAC file support... " >&6; }
+    if test "x$flac_available" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_flac="no"
+        echo "***"
+        echo "*** Warning: FLAC file support disabled, libflac missing"
+        echo "*** (Install libflac, libogg and libvorbis libraries to enable it)"
+        echo "***"
+    elif test "x$ogg_available" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_flac="no"
+        echo "***"
+        echo "*** Warning: FLAC file support disabled, libvorbis missing"
+        echo "*** (Install libflac, libogg and libvorbis libraries to enable it)"
+        echo "***"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_FLAC 1" >>confdefs.h
+
+    fi
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC file support" >&5
+$as_echo_n "checking for FLAC file support... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    echo "***"
+    echo "*** FLAC file support disabled on commandline"
+    echo "*** (Install libflac, libogg and libvorbis libraries, and use --enable-flac to enable it)"
+    echo "***"
+fi
+
+if test "x$enable_flac" = "xyes"; then
+    LIBS_SAVE="$LIBS"
+    CFLAGS_SAVE="$CFLAGS"
+    LIBS="$LIBS $LIBFLAC_LIBS"
+    CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libFLAC version" >&5
+$as_echo_n "checking for libFLAC version... " >&6; }
+        if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assuming ${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH} $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <FLAC/format.h>
+int
+main (void)
+{
+    FILE *output;
+    char tmp[16];
+    int libflac_major, libflac_minor, libflac_patch;
+
+    sprintf(tmp,"%s",FLAC__VERSION_STRING);
+    libflac_major = atoi( (char *)strtok(tmp,".") );
+    libflac_minor = atoi( (char *)strtok(NULL,".") );
+    libflac_patch = atoi( (char *)strtok(NULL,".") );
+    output=fopen("conftest.flac","w");
+    fprintf(output,"LIBFLAC_MAJOR=%d\nLIBFLAC_MINOR=%d\nLIBFLAC_PATCH=%d\n",libflac_major,libflac_minor,libflac_patch);
+    fclose(output);
+    exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  . ./conftest.flac; echo "${LIBFLAC_MAJOR}.${LIBFLAC_MINOR}.${LIBFLAC_PATCH}"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not determine libFLAC version" >&5
+$as_echo "$as_me: WARNING: could not determine libFLAC version" >&2;}
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    LIBS="$LIBS_SAVE"
+    CFLAGS="$CFLAGS_SAVE"
+    LIBFLAC_VERSION="(flac-$LIBFLAC_MAJOR.$LIBFLAC_MINOR.$LIBFLAC_PATCH)"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define LIBFLAC_MAJOR $LIBFLAC_MAJOR
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define LIBFLAC_MINOR $LIBFLAC_MINOR
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define LIBFLAC_PATCH $LIBFLAC_PATCH
+_ACEOF
+
+
+
+if test "x$enable_mp3" = "xyes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP3 file support" >&5
+$as_echo_n "checking for MP3 file support... " >&6; }
+    ac_fn_c_check_header_mongrel "$LINENO" "id3tag.h" "ac_cv_header_id3tag_h" "$ac_includes_default"
+if test "x$ac_cv_header_id3tag_h" = x""yes; then :
+
+else
+  libid3tag_available=no
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3_frame_field in -lid3tag" >&5
+$as_echo_n "checking for id3_frame_field in -lid3tag... " >&6; }
+if test "${ac_cv_lib_id3tag_id3_frame_field+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lid3tag -lz $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char id3_frame_field ();
+int
+main ()
+{
+return id3_frame_field ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_id3tag_id3_frame_field=yes
+else
+  ac_cv_lib_id3tag_id3_frame_field=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3tag_id3_frame_field" >&5
+$as_echo "$ac_cv_lib_id3tag_id3_frame_field" >&6; }
+if test "x$ac_cv_lib_id3tag_id3_frame_field" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBID3TAG 1
+_ACEOF
+
+  LIBS="-lid3tag $LIBS"
+
+else
+  libid3tag_available=no
+fi
+
+    if test "x$libid3tag_available" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_mp3="no"
+        echo "***"
+        echo "*** Warning: MP3 file support disabled, libid3tag missing"
+        echo "***"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_MP3 1" >>confdefs.h
+
+    fi
+
+    if test "x$enable_id3v23" = "xyes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ID3Tag_Link" >&5
+$as_echo_n "checking for library containing ID3Tag_Link... " >&6; }
+if test "${ac_cv_search_ID3Tag_Link+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ID3Tag_Link ();
+int
+main ()
+{
+return ID3Tag_Link ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' "id3" "id3 -lstdc++" "id3 -lz" "id3 -lz -lstdc++"; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_ID3Tag_Link=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_ID3Tag_Link+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_ID3Tag_Link+set}" = set; then :
+
+else
+  ac_cv_search_ID3Tag_Link=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ID3Tag_Link" >&5
+$as_echo "$ac_cv_search_ID3Tag_Link" >&6; }
+ac_res=$ac_cv_search_ID3Tag_Link
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: id3lib not found" >&5
+$as_echo "$as_me: WARNING: id3lib not found" >&2;}; id3lib_available=no
+fi
+
+
+                LIBS="-lz -lstdc++ $LIBS"
+
+                ID3LIB_MAJOR=3
+        ID3LIB_MINOR=8
+        ID3LIB_PATCH=0
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3lib version" >&5
+$as_echo_n "checking for id3lib version... " >&6; }
+              if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <id3.h>
+        #include <stdio.h>
+        int main ()
+        {
+            FILE *output;
+            output=fopen("conftest.id3","w");
+            fprintf(output,"ID3LIB_MAJOR=%d\nID3LIB_MINOR=%d\nID3LIB_PATCH=%d\n",ID3LIB_MAJOR_VERSION,ID3LIB_MINOR_VERSION,ID3LIB_PATCH_VERSION);
+            fclose(output);
+            exit(0);
+        }
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  . ./conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not determine id3lib version" >&5
+$as_echo "$as_me: WARNING: could not determine id3lib version" >&2;}; id3lib_available=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define ID3LIB_MAJOR $ID3LIB_MAJOR
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define ID3LIB_MINOR $ID3LIB_MINOR
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define ID3LIB_PATCH $ID3LIB_PATCH
+_ACEOF
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP3 file support" >&5
+$as_echo_n "checking for MP3 file support... " >&6; }
+        if test "x$id3lib_available" = "xno"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+            echo "***"
+            echo "*** Warning: id3v23 tags support disabled, id3lib missing"
+            echo "***"
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_ID3LIB 1" >>confdefs.h
+
+            ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"
+        fi
+    fi
+fi
+
+
+if test "x$enable_mp4" = "xyes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4 file support" >&5
+$as_echo_n "checking for MP4 file support... " >&6; }
+    ac_fn_c_check_header_mongrel "$LINENO" "mp4v2/mp4v2.h" "ac_cv_header_mp4v2_mp4v2_h" "$ac_includes_default"
+if test "x$ac_cv_header_mp4v2_mp4v2_h" = x""yes; then :
+
+else
+  mp4_available=no
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4GetTrackMediaDataName in -lmp4v2" >&5
+$as_echo_n "checking for MP4GetTrackMediaDataName in -lmp4v2... " >&6; }
+if test "${ac_cv_lib_mp4v2_MP4GetTrackMediaDataName+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmp4v2 -lmp4v2 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MP4GetTrackMediaDataName ();
+int
+main ()
+{
+return MP4GetTrackMediaDataName ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_mp4v2_MP4GetTrackMediaDataName=yes
+else
+  ac_cv_lib_mp4v2_MP4GetTrackMediaDataName=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp4v2_MP4GetTrackMediaDataName" >&5
+$as_echo "$ac_cv_lib_mp4v2_MP4GetTrackMediaDataName" >&6; }
+if test "x$ac_cv_lib_mp4v2_MP4GetTrackMediaDataName" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMP4V2 1
+_ACEOF
+
+  LIBS="-lmp4v2 $LIBS"
+
+else
+  mp4_available=no
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4/AAC file support" >&5
+$as_echo_n "checking for MP4/AAC file support... " >&6; }
+if test "x$enable_mp4" = "xyes"; then
+    if test "x$mp4_available" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_mp4="no"
+        echo "***"
+        echo "*** Warning: MP4 file support disabled"
+        echo "*** (Install libmp4v2 >= 1.9.0 to enable it)"
+        echo "***"
+    else
+
+                LIBS_SAVE="$LIBS"
+        CFLAGS_SAVE="$CFLAGS"
+        LIBS="$LIBS $LIBMP4V2_LIBS"
+        CFLAGS="$CFLAGS $LIBMP4V2_CFLAGS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmp4v2 version" >&5
+$as_echo_n "checking for libmp4v2 version... " >&6; }
+            if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assuming ${LIBMP4V2_NAME}-${LIBMP4V2_VERSION} $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #include <stdio.h>
+                #include <mp4v2/mp4v2.h>
+                int main (void)
+                {
+                    FILE *output;
+                    output=fopen("conftest.mp4v2","w");
+                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
+                    fclose(output);
+                    exit(0);
+                }
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  . ./conftest.mp4v2; echo "${LIBMP4V2_NAME}-${LIBMP4V2_VERSION}"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not determine libmp4v2 version" >&5
+$as_echo "$as_me: WARNING: could not determine libmp4v2 version" >&2;}
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+        LIBS="$LIBS_SAVE"
+        CFLAGS="$CFLAGS_SAVE"
+        if test "$LIBMP4V2_VERSION" != ""; then
+            LIBMP4V2_VERSION="($LIBMP4V2_NAME-$LIBMP4V2_VERSION)"
+        fi
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+           #include <mp4v2/mp4v2.h>
+           main () {
+           MP4FileHandle hFile;
+           MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define NEWMP4 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_MP4 1" >>confdefs.h
+
+    fi
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    enable_mp4="no"
+    echo "***"
+    echo "*** MP4 file support disabled on commandline"
+    echo "*** (Install libmp4v2 and use --enable-mp4 to enable it)"
+    echo "***"
+fi
+
+
+if test "x$enable_wavpack" = "xyes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAVPACK" >&5
+$as_echo_n "checking for WAVPACK... " >&6; }
+
+if test -n "$WAVPACK_CFLAGS"; then
+    pkg_cv_WAVPACK_CFLAGS="$WAVPACK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.40\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wavpack >= 4.40") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAVPACK_CFLAGS=`$PKG_CONFIG --cflags "wavpack >= 4.40" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$WAVPACK_LIBS"; then
+    pkg_cv_WAVPACK_LIBS="$WAVPACK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.40\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wavpack >= 4.40") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAVPACK_LIBS=`$PKG_CONFIG --libs "wavpack >= 4.40" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        WAVPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "wavpack >= 4.40" 2>&1`
+        else
+	        WAVPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors "wavpack >= 4.40" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$WAVPACK_PKG_ERRORS" >&5
+
+	wavpack_available=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	wavpack_available=no
+else
+	WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS
+	WAVPACK_LIBS=$pkg_cv_WAVPACK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+    if test "x$wavpack_available" = "xno"; then
+        echo "***"
+        echo "*** Warning: wavpack >= 4.40 needed"
+        echo "***"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WavpackOpenFileInput in -lwavpack" >&5
+$as_echo_n "checking for WavpackOpenFileInput in -lwavpack... " >&6; }
+if test "${ac_cv_lib_wavpack_WavpackOpenFileInput+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwavpack  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char WavpackOpenFileInput ();
+int
+main ()
+{
+return WavpackOpenFileInput ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_wavpack_WavpackOpenFileInput=yes
+else
+  ac_cv_lib_wavpack_WavpackOpenFileInput=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wavpack_WavpackOpenFileInput" >&5
+$as_echo "$ac_cv_lib_wavpack_WavpackOpenFileInput" >&6; }
+if test "x$ac_cv_lib_wavpack_WavpackOpenFileInput" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBWAVPACK 1
+_ACEOF
+
+  LIBS="-lwavpack $LIBS"
+
+else
+  wavpack_available=no
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Wavpack file support" >&5
+$as_echo_n "checking for Wavpack file support... " >&6; }
+if test "x$enable_wavpack" = "xyes"; then
+    if test "x$wavpack_available" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_wavpack="no"
+        echo "***"
+        echo "*** Warning: Wavpack file support disabled"
+        echo "*** (Install libwavpack to enable it)"
+        echo "***"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_WAVPACK 1" >>confdefs.h
+
+    fi
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    enable_wavpack="no"
+    echo "***"
+    echo "*** Wavpack file support disabled on commandline"
+    echo "*** (Install libwavpack, and use --enable-wavpack to enable it)"
+    echo "***"
+fi
+
+if test "x$GCC" = "xyes"; then
+  case " $CFLAGS " in
+  *[\ \	]-Wall[\ \	]*) ;;
+  *) CFLAGS="$CFLAGS -Wall" ;;
+  esac
+fi
+
+
+
+
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+if eval "test \"\${$as_ac_Header+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <$ac_hdr>
+
+int
+main ()
+{
+if ((DIR *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_ac_Header=yes"
+else
+  eval "$as_ac_Header=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
+
+ac_header_dirent=$ac_hdr; break
+fi
+
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dir; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' x; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+for ac_header in fcntl.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this.  */
+  typedef int charset[2];
+  const charset cs;
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_const=yes
+else
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define mode_t int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test "${ac_cv_struct_tm+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <time.h>
+
+int
+main ()
+{
+struct tm tm;
+				     int *p = &tm.tm_sec;
+				     return !p;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_struct_tm=time.h
+else
+  ac_cv_struct_tm=sys/time.h
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
+if test $ac_cv_struct_tm = sys/time.h; then
+
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+
+fi
+
+
+
+for ac_header in vfork.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VFORK_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_func in fork vfork
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+if test "x$ac_cv_func_fork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if test "${ac_cv_func_fork_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_fork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	  /* By Ruediger Kuhlmann. */
+	  return fork () < 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_fork_works=yes
+else
+  ac_cv_func_fork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
+
+else
+  ac_cv_func_fork_works=$ac_cv_func_fork
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+  case $host in
+    *-*-amigaos* | *-*-msdosdjgpp*)
+      # Override, as these systems have only a dummy fork() stub
+      ac_cv_func_fork_works=no
+      ;;
+    *)
+      ac_cv_func_fork_works=yes
+      ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+fi
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if test "${ac_cv_func_vfork_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_vfork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Thanks to Paul Eggert for this test.  */
+$ac_includes_default
+#include <sys/wait.h>
+#ifdef HAVE_VFORK_H
+# include <vfork.h>
+#endif
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.  The compiler
+   is told about this with #include <vfork.h>, but some compilers
+   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
+   static variable whose address is put into a register that is
+   clobbered by the vfork.  */
+static void
+#ifdef __cplusplus
+sparc_address_test (int arg)
+# else
+sparc_address_test (arg) int arg;
+#endif
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
+
+int
+main ()
+{
+  pid_t parent = getpid ();
+  pid_t child;
+
+  sparc_address_test (0);
+
+  child = vfork ();
+
+  if (child == 0) {
+    /* Here is another test for sparc vfork register problems.  This
+       test uses lots of local variables, at least as many local
+       variables as main has allocated so far including compiler
+       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
+       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
+       reuse the register of parent for one of the local variables,
+       since it will think that parent can't possibly be used any more
+       in this routine.  Assigning to the local variable will thus
+       munge parent in the parent process.  */
+    pid_t
+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+    /* Convince the compiler that p..p7 are live; otherwise, it might
+       use the same hardware register for all 8 local variables.  */
+    if (p != p1 || p != p2 || p != p3 || p != p4
+	|| p != p5 || p != p6 || p != p7)
+      _exit(1);
+
+    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
+       from child file descriptors.  If the child closes a descriptor
+       before it execs or exits, this munges the parent's descriptor
+       as well.  Test for this by closing stdout in the child.  */
+    _exit(close(fileno(stdout)) != 0);
+  } else {
+    int status;
+    struct stat st;
+
+    while (wait(&status) != child)
+      ;
+    return (
+	 /* Was there some problem with vforking?  */
+	 child < 0
+
+	 /* Did the child fail?  (This shouldn't happen.)  */
+	 || status
+
+	 /* Did the vfork/compiler bug occur?  */
+	 || parent != getpid()
+
+	 /* Did the file descriptor bug occur?  */
+	 || fstat(fileno(stdout), &st) != 0
+	 );
+  }
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_vfork_works=yes
+else
+  ac_cv_func_vfork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
+
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+  ac_cv_func_vfork_works=$ac_cv_func_vfork
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+fi
+
+if test "x$ac_cv_func_vfork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+
+else
+
+$as_echo "#define vfork fork" >>confdefs.h
+
+fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftest.sym conftest.file
+echo >conftest.file
+if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+struct stat sbuf;
+     /* Linux will dereference the symlink and fail, as required by POSIX.
+	That is better in the sense that it means we will not
+	have to compile and use the lstat wrapper.  */
+     return lstat ("conftest.sym/", &sbuf) == 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=yes
+else
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+else
+  # If the `ln -s' command failed, then we probably don't even
+  # have an lstat function.
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+fi
+rm -f conftest.sym conftest.file
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+
+test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+
+cat >>confdefs.h <<_ACEOF
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+_ACEOF
+
+
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+  case " $LIBOBJS " in
+  *" lstat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ ;;
+esac
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
+$as_echo_n "checking whether stat accepts an empty string... " >&6; }
+if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_stat_empty_string_bug=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+struct stat sbuf;
+  return stat ("", &sbuf) == 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_stat_empty_string_bug=no
+else
+  ac_cv_func_stat_empty_string_bug=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
+$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
+if test $ac_cv_func_stat_empty_string_bug = yes; then
+  case " $LIBOBJS " in
+  *" stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS stat.$ac_objext"
+ ;;
+esac
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STAT_EMPTY_STRING_BUG 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if test "${ac_cv_type_signal+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <signal.h>
+
+int
+main ()
+{
+return *(signal (0, 0)) (0) == 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_type_signal=int
+else
+  ac_cv_type_signal=void
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
+for ac_func in mkdir strstr strtol mkstemp
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+   for ac_header in locale.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALE_H 1
+_ACEOF
+
+fi
+
+done
+
+    if test $ac_cv_header_locale_h = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <locale.h>
+int
+main ()
+{
+return LC_MESSAGES
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_val_LC_MESSAGES=yes
+else
+  am_cv_val_LC_MESSAGES=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+    if test $am_cv_val_LC_MESSAGES = yes; then
+
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+
+    fi
+  fi
+     USE_NLS=yes
+
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
+  gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
+$as_echo_n "checking for ngettext in libc... " >&6; }
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+
+int
+main ()
+{
+return !ngettext ("","", 1)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_ngettext_libc=yes
+else
+  gt_cv_func_ngettext_libc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+$as_echo_n "checking for dgettext in libc... " >&6; }
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+
+int
+main ()
+{
+return !dgettext ("","")
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_dgettext_libc=yes
+else
+  gt_cv_func_dgettext_libc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+      fi
+
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+_ACEOF
+
+fi
+done
+
+      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
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bindtextdomain ();
+int
+main ()
+{
+return bindtextdomain ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_bindtextdomain=yes
+else
+  ac_cv_lib_intl_bindtextdomain=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_ngettext=yes
+else
+  ac_cv_lib_intl_ngettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+$as_echo_n "checking for dgettext in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dgettext ();
+int
+main ()
+{
+return dgettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_dgettext=yes
+else
+  ac_cv_lib_intl_dgettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+  gt_cv_func_dgettext_libintl=yes
+fi
+
+fi
+
+fi
+
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
+$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl -liconv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_ngettext=yes
+else
+  ac_cv_lib_intl_ngettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+$as_echo_n "checking for dcgettext in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl -liconv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dcgettext ();
+int
+main ()
+{
+return dcgettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_dcgettext=yes
+else
+  ac_cv_lib_intl_dcgettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+  gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv
+else
+  :
+fi
+
+else
+  :
+fi
+
+        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
+          for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+_ACEOF
+
+fi
+done
+
+          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
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+	# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGFMT" in
+  /*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != "no"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  for ac_func in dcgettext
+do :
+  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DCGETTEXT 1
+_ACEOF
+
+fi
+done
+
+	  MSGFMT_OPTS=
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+$as_echo_n "checking if msgfmt accepts -c... " >&6; }
+	  cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo at bar.xx>\n"
+"Language-Team: C <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
+	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+	  # Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$XGETTEXT" in
+  /*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  CATOBJEXT=.gmo
+             DATADIRNAME=share
+else
+  case $host in
+	    *-*-solaris*)
+	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+  CATOBJEXT=.gmo
+               DATADIRNAME=share
+else
+  CATOBJEXT=.mo
+               DATADIRNAME=lib
+fi
+
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+
+fi
+
+
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+    fi
+
+        if test "$XGETTEXT" != ":"; then
+                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    ac_config_commands="$ac_config_commands default-1"
+
+
+                for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+
+
+
+
+
+
+
+
+
+
+
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
+       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
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
+     fi
+
+          if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
+         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
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+
+ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile src/libmpg123/Makefile po/Makefile.in"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by easytag $as_me 2.1.7, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+easytag config.status 2.1.7
+configured by $0, generated by GNU Autoconf 2.67,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_CXX \
+hardcode_libdir_separator_CXX \
+fix_srcfile_path_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "easytag.spec") CONFIG_FILES="$CONFIG_FILES easytag.spec" ;;
+    "doc/easytag.1") CONFIG_FILES="$CONFIG_FILES doc/easytag.1" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/id3lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/id3lib/Makefile" ;;
+    "src/libapetag/Makefile") CONFIG_FILES="$CONFIG_FILES src/libapetag/Makefile" ;;
+    "src/libmpg123/Makefile") CONFIG_FILES="$CONFIG_FILES src/libmpg123/Makefile" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
+
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+    "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+echo
+echo Configuration for $PACKAGE $VERSION :
+echo --------------------------------
+echo
+echo Source code location ....: $srcdir
+echo Host System Type ........: $host
+echo Preprocessor ............: $CC $CPPFLAGS
+echo Compiler ................: $CC $CFLAGS
+echo Linker ..................: $CC $LDFLAGS $LIBS
+echo GTK2 version ............: `pkg-config --modversion gtk+-2.0`
+echo MP3 file support ........: $enable_mp3
+echo ID3v2.3 tags support ....: $enable_id3v23 $ID3LIB_VERSION
+echo Ogg Vorbis file support .: $enable_ogg
+echo Speex file support ......: $enable_speex
+echo FLAC file support .......: $enable_flac $LIBFLAC_VERSION
+echo MP4 file support ........: $enable_mp4 $LIBMP4V2_VERSION
+echo WavPack support .........: $enable_wavpack
+echo NLS/gettext .............: $USE_NLS
+echo Install path ............: $prefix
+echo
+echo Now type 'make' to build $PACKAGE $VERSION,
+echo and then 'make install' for installation.
+echo
diff --git a/configure.in b/configure.in
index 369af50..cfa8fb1 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl AC_INIT(src/easytag.h)
 AC_PREREQ(2.53)
 
 dnl To set also in config.h.mingw
-AC_INIT(easytag, 2.1.6) dnl defines ($PACKAGE, $VERSION)
+AC_INIT(easytag, 2.1.7) dnl defines ($PACKAGE, $VERSION)
 
 AC_CONFIG_SRCDIR(src/easytag.h)
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/easytag.spec b/easytag.spec
index 8dd6d2d..7c76fa5 100644
--- a/easytag.spec
+++ b/easytag.spec
@@ -1,5 +1,5 @@
 %define    name      easytag
-%define    version   2.1.6
+%define    version   2.1.7
 %define    release   1
 %define    prefix    /usr
 
diff --git a/ltmain.sh b/ltmain.sh
new file mode 100755
index 0000000..7ed280b
--- /dev/null
+++ b/ltmain.sh
@@ -0,0 +1,8413 @@
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6b
+# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#     --config             show all configuration variables
+#     --debug              enable verbose shell tracing
+# -n, --dry-run            display commands without modifying any files
+#     --features           display basic configuration information and exit
+#     --mode=MODE          use operation mode MODE
+#     --preserve-dup-deps  don't remove duplicate dependency libraries
+#     --quiet, --silent    don't print informational messages
+#     --tag=TAG            use configuration variables from tag TAG
+# -v, --verbose            print informational messages (default)
+#     --version            print version information
+# -h, --help               print short or long help message
+#
+# MODE must be one of the following:
+#
+#       clean              remove files from the build directory
+#       compile            compile a source file into a libtool object
+#       execute            automatically set library path, then run a program
+#       finish             complete the installation of libtool libraries
+#       install            install libraries or executables
+#       link               create a library or an executable
+#       uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#       host-triplet:	$host
+#       shell:		$SHELL
+#       compiler:		$LTCC
+#       compiler flags:		$LTCFLAGS
+#       linker:		$LD (gnu? $with_gnu_ld)
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       automake:		$automake_version
+#       autoconf:		$autoconf_version
+#
+# Report bugs to <bug-libtool at gnu.org>.
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+TIMESTAMP=""
+package_revision=1.3017
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/bin/sed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+# Generated shell functions inserted here.
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+  -*) progname=./$progname ;;
+esac
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=:
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "X$my_tmpdir" | $Xsed
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "X$1" | $Xsed \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $SED -n '/^# Usage:/,/# -h/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    $ECHO
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	p
+     }' < "$progpath"
+    exit $?
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    func_error "missing argument for $1"
+    exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell, and then maybe $ECHO will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    $ECHO "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      $ECHO "enable shared libraries"
+    else
+      $ECHO "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      $ECHO "enable static libraries"
+    else
+      $ECHO "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# Parse options once, thoroughly.  This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
+
+  # Shorthand for --mode=foo, only valid as the first argument
+  case $1 in
+  clean|clea|cle|cl)
+    shift; set dummy --mode clean ${1+"$@"}; shift
+    ;;
+  compile|compil|compi|comp|com|co|c)
+    shift; set dummy --mode compile ${1+"$@"}; shift
+    ;;
+  execute|execut|execu|exec|exe|ex|e)
+    shift; set dummy --mode execute ${1+"$@"}; shift
+    ;;
+  finish|finis|fini|fin|fi|f)
+    shift; set dummy --mode finish ${1+"$@"}; shift
+    ;;
+  install|instal|insta|inst|ins|in|i)
+    shift; set dummy --mode install ${1+"$@"}; shift
+    ;;
+  link|lin|li|l)
+    shift; set dummy --mode link ${1+"$@"}; shift
+    ;;
+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+    shift; set dummy --mode uninstall ${1+"$@"}; shift
+    ;;
+  esac
+
+  # Parse non-mode specific arguments:
+  while test "$#" -gt 0; do
+    opt="$1"
+    shift
+
+    case $opt in
+      --config)		func_config					;;
+
+      --debug)		preserve_args="$preserve_args $opt"
+			func_echo "enabling shell trace mode"
+			opt_debug='set -x'
+			$opt_debug
+			;;
+
+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			execute_dlfiles="$execute_dlfiles $1"
+			shift
+			;;
+
+      --dry-run | -n)	opt_dry_run=:					;;
+      --features)       func_features					;;
+      --finish)		mode="finish"					;;
+
+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			case $1 in
+			  # Valid mode arguments:
+			  clean)	;;
+			  compile)	;;
+			  execute)	;;
+			  finish)	;;
+			  install)	;;
+			  link)		;;
+			  relink)	;;
+			  uninstall)	;;
+
+			  # Catch anything else as an error
+			  *) func_error "invalid argument for $opt"
+			     exit_cmd=exit
+			     break
+			     ;;
+		        esac
+
+			mode="$1"
+			shift
+			;;
+
+      --preserve-dup-deps)
+			opt_duplicate_deps=:				;;
+
+      --quiet|--silent)	preserve_args="$preserve_args $opt"
+			opt_silent=:
+			;;
+
+      --verbose| -v)	preserve_args="$preserve_args $opt"
+			opt_silent=false
+			;;
+
+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			preserve_args="$preserve_args $opt $1"
+			func_enable_tag "$1"	# tagname is set here
+			shift
+			;;
+
+      # Separate optargs to long options:
+      -dlopen=*|--mode=*|--tag=*)
+			func_opt_split "$opt"
+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+			shift
+			;;
+
+      -\?|-h)		func_usage					;;
+      --help)		opt_help=:					;;
+      --version)	func_version					;;
+
+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
+
+      *)		nonopt="$opt"
+			break
+			;;
+    esac
+  done
+
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      ;;
+  esac
+
+  # Having warned about all mis-specified options, bail out if
+  # anything was wrong.
+  $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+$opt_help || {
+  # Sanity checks first:
+  func_check_version_match
+
+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+    func_fatal_configuration "not configured to build any kind of library"
+  fi
+
+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+  # Darwin sucks
+  eval std_shrext=\"$shrext_cmds\"
+
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    func_error "unrecognized option \`-dlopen'"
+    $ECHO "$help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$progname --help --mode=$mode' for more information."
+}
+
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_ltwrapper_scriptname_result=""
+    if func_ltwrapper_executable_p "$1"; then
+	func_dirname_and_basename "$1" "" "."
+	func_stripname '' '.exe' "$func_basename_result"
+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+        func_quote_for_eval "$arg"
+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_quote_for_eval "$arg"
+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	    done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          pie_flag="$pie_flag $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  later="$later $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_quote_for_eval "$arg"
+	    lastarg="$lastarg $func_quote_for_eval_result"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  base_compile="$base_compile $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_quote_for_eval "$lastarg"
+      base_compile="$base_compile $func_quote_for_eval_result"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      removelist="$removelist $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    removelist="$removelist $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$mode'"
+        ;;
+    esac
+
+    $ECHO
+    $ECHO "Try \`$progname --help' for more information about other modes."
+
+    exit $?
+}
+
+  # Now that we've collected a possible --mode arg, show help if necessary
+  $opt_help && func_mode_help
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_quote_for_eval "$file"
+      args="$args $func_quote_for_eval_result"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	$ECHO "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    $ECHO "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $ECHO "   $libdir"
+    done
+    $ECHO
+    $ECHO "If you ever happen to want to link against installed libraries"
+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $ECHO "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $ECHO "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $ECHO "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      $ECHO "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $ECHO "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $ECHO
+
+    $ECHO "See any operating system documentation about shared libraries for"
+    case $host in
+      solaris2.[6789]|solaris2.1[0-9])
+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	$ECHO "pages."
+	;;
+      *)
+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+        ;;
+    esac
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    exit $EXIT_SUCCESS
+}
+
+test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    install_prog="$install_prog$func_quote_for_eval_result"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      install_prog="$install_prog $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_verbose "extracting global C symbols from \`$progfile'"
+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+	  $opt_dry_run || {
+	    eval '$ECHO ": $name " >> "$nlist"'
+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	  }
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+"
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* )
+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs.  */"
+	    lt_dlsym_const= ;;
+	  *osf5*)
+	    echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+	    lt_dlsym_const= ;;
+	  *)
+	    lt_dlsym_const=const ;;
+	  esac
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+
+# func_emit_wrapper_part1 [arg=no]
+#
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+	func_emit_wrapper_part1_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part1_arg1=$1
+	fi
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    ECHO=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$ECHO will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$ECHO "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2* | *-cegcc*)
+	  $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
+
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat <<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+# define setmode _setmode
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
+
+const char *program_name = NULL;
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+
+static const char *script_text_part1 =
+EOF
+
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat <<EOF
+
+static const char *script_text_part2 =
+EOF
+	    func_emit_wrapper_part2 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+
+	    cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_pathlist "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_pathlist "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
+
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+  /* very simple arg parsing; don't want to rely on getopt */
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  printf ("%s", script_text_part1);
+	  printf ("%s", script_text_part2);
+	  return 0;
+	}
+    }
+
+  newargz = XMALLOC (char *, argc + 1);
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+			  tmp_pathspec));
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+			  actual_cwrapper_path));
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  for (i = 0; i < newargc; i++)
+    {
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal ("getcwd failed");
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+			      tmp_pathspec));
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  char *errstr = strerror (errno);
+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  weak_libs="$weak_libs $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname '-L' '' "$arg"
+	dir=$func_stripname_result
+	if test -z "$dir"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot)
+	compiler_flags="$compiler_flags $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	compiler_flags="$compiler_flags $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_duplicate_deps ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  case $lib in
+	  *.la)	func_source "$lib" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) deplibs="$deplibs $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    compiler_flags="$compiler_flags $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    dir=$func_stripname_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		$ECHO
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
+		$ECHO "*** that it is just a static archive that I should not use here."
+	      else
+		$ECHO
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_duplicate_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		esac
+	      fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	    # Keep a list of preopened convenience libraries to check
+	    # that they are being used correctly in the link pass.
+	    test -z "$libdir" && \
+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         newlib_search_path="$newlib_search_path $func_stripname_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    $ECHO
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  $ECHO
+			  $ECHO "*** And there doesn't seem to be a static archive available"
+			  $ECHO "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    $ECHO
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    $ECHO "*** I have the capability to make that library automatically link in when"
+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
+	    $ECHO "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      $ECHO "*** But as you try to build a module library, libtool will still create "
+	      $ECHO "*** a static module, that should work as long as the dlopening application"
+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		$ECHO
+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$ECHO "*** not find such a program.  So, this module is probably useless."
+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_dirname "$deplib" "" "."
+		dir="$func_dirname_result"
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  $ECHO
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      libobjs="$libobjs $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $ECHO
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    $ECHO "*** I have the capability to make that library automatically link in when"
+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
+		    $ECHO "*** shared version of the library, which I believe you do not have"
+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		newdeplibs="$newdeplibs $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      $ECHO
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      $ECHO "*** I have the capability to make that library automatically link in when"
+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
+		      $ECHO "*** shared version of the library, which you do not appear to have"
+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  $ECHO
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $ECHO "*** make it link in!  You will probably need to install it or some"
+		  $ECHO "*** library that it depends on before this library will be fully"
+		  $ECHO "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		newdeplibs="$newdeplibs $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+	    done
+	  fi
+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
+	     $GREP . >/dev/null; then
+	    $ECHO
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    $ECHO "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    $ECHO
+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $ECHO "*** a static module, that should work as long as the dlopening"
+	    $ECHO "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      $ECHO
+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $ECHO "*** not find such a program.  So, this module is probably useless."
+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
+	    $ECHO "*** automatically added whenever a program is linked with this library"
+	    $ECHO "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      $ECHO
+	      $ECHO "*** Since this library must not contain undefined symbols,"
+	      $ECHO "*** because either the platform does not support them or"
+	      $ECHO "*** it was explicitly requested with -no-undefined,"
+	      $ECHO "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  delfiles="$delfiles $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      eval cmd=\"$cmd\"
+	      func_len " $cmd"
+	      len=$func_len_result
+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    $ECHO 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    $ECHO ')' >> $output
+	    delfiles="$delfiles $output"
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    delfiles="$delfiles $output"
+	    output=$firstobj\"$file_list_spec$output\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=$obj
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      delfiles="$delfiles $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  libobjs="$libobjs $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      compile_command="$compile_command ${wl}-bind_at_load"
+	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $ECHO for shipping.
+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    oldobjs="$oldobjs $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	generated="$generated $gentop"
+
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  oldobjs="$oldobjs $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $ECHO "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlfiles="$newdlfiles $libdir/$name"
+		;;
+	      *) newdlfiles="$newdlfiles $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlprefiles="$newdlprefiles $libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles="$newdlfiles $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles="$newdlprefiles $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$mode" = link || test "$mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) RM="$RM $arg"; rmforce=yes ;;
+      -*) RM="$RM $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    origobjdir="$objdir"
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	objdir="$origobjdir"
+      else
+	objdir="$dir/$origobjdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+
diff --git a/po/bg.gmo b/po/bg.gmo
index 90b9304..cbb2d98 100644
Binary files a/po/bg.gmo and b/po/bg.gmo differ
diff --git a/po/bg.po b/po/bg.po
index 3cbb083..b8811ac 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag 1.99.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2005-09-09 18:38+0300\n"
 "Last-Translator: Luchezar P. Petkov <>\n"
 "Language-Team: Bulgarian <dict at fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr ""
 "интерфейс правят поставянето на етикети приятно под GNU/Liux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Превод на немски)"
 
@@ -111,111 +113,111 @@ msgstr "(Превод на гръцки)"
 msgid "(Serbian translation)"
 msgstr "(Превод на немски)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Коментар"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Относно..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Относно"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "Компилиран на: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "Използват се: GTK+ %d.%d.%d и id3lib %d.%d.%d"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "Електронна поща: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Интернет страница: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Описание:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Няма налична памет"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "Поддръжката за Ogg Vorbis файлове е изключена)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
@@ -223,33 +225,33 @@ msgstr "Поддръжката за FLAC файлове е изключена"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Благодарности"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Преводачи:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Програмисти:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Промени"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Неможе да се зареди файла '%s' (%s)"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Появи се грешка по време на отварянето на файл: '%s' (%s)."
@@ -257,487 +259,497 @@ msgstr "Появи се грешка по време на отварянето 
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Файл"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Сортиране по етикет"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Сортиране по изпълнител"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Възходящо по име на файл"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Низходящо по име на файл"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Възходящо по дата на създаване"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Низходящо по дата на създаване"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Възходящо по номер на песен"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Низходящо по номер на песен"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Възходящо по заглавие"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Низходящо по заглавие"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Възходящо по изпълнител"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Низходящо по изпълнител"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Възходящо по изпълнител"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Низходящо по изпълнител"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Възходящо по албум"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Низходящо по албум"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Възходящо по година"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Низходящо по година"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Възходящо по жанр"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Низходящо по жанр"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Възходящо по коментар"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Възходящо по коментар"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Възходящо по композитор"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Низходящо по композитор"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Възходящо по оригинален изпълнител"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Низходящо по оригинален изпълнител"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Възходящо по авторско право"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Низходящо по авторско право"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Възходящо по URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Низходящо по URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr ""
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr ""
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Възходящо по тип на файла"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Низходящо по тип на файла"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Възходящо по размер на файла"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Низходящо по размер на файла"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Възходящо по времетраене"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Низходящо по времетраене"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr ""
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr ""
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr ""
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr ""
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Отворяне на файл с"
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Избира всички файлове"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr ""
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr ""
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Изтрива файл(ове)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Първи файл"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Първи файл"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Предишен файл"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Предишен файл"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "Следващ файл"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Следващ файл"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Последен файл"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Последен файл"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "С_каниране за файлове"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Сканиране за файлове"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Премахване етикет"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Премахване на етикет"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Отменя последната промяна"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Отменя последната промяна"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr ""
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr ""
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Запазване"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Запазване"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "_Force Saving File(s)"
 msgstr "С_каниране за файлове"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "Force Saving File(s)"
 msgstr "Сканиране за файлове"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Отменя последните промени"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Възтановява последните промени"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Спиране на програмата"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Спиране на програмата"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Браузър"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Отива в _домашната папка"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Отива в домашната папка"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Отива в папка по подразбиране"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Отива в домашната папка"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Отива в домашната папка"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Отива в домашната папка"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Отива в _папка по подразбиране"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Отива в папка по подразбиране"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Запазва текущия път по подразбиране"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Запазва текущият път по подразбиране"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Преглед като списък | Преглед като изпълнител-албум"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Преименува папка"
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Презарежда папка"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Разглежда папка с ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Сгъване на дървото"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Презареждане на дървото"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "С_кенер"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Попълва етикет(и) ..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Попълва етикет(и) ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Преименува файловете и папката"
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Преименува файловете и папката"
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Полета на процеси"
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Полета на процеси"
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Разни"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Търсене за _файлове ..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Търсене за файлове ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Търсене в база данни на диск ... "
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB търсене ..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Зарежда имена на файлове от текст ..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Записва playlist ..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Отваря програма за музика"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Настройки"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Предпочитания ..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Предпочитания ..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Помощ"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Относно"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Спира текущата операция"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Файлови операции"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Търсене за файлове в CDDB ..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Преглежда _поддиректории"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 #, fuzzy
 msgid "Show Hidden Directories"
 msgstr "Търси скрити директории"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Показва като списък / Показва по ипълнител и албум"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr ""
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Готов да започне..."
 
@@ -746,7 +758,7 @@ msgid "New default path for files selected"
 msgstr "Нов път по подразбиране за избраните файлове"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Потвърждение..."
 
@@ -759,88 +771,93 @@ msgstr ""
 "Някои файлове бяха променени, но бяха записани...\n"
 "Желаете ли да ги запазите, преди да смените директорията?Грешка..."
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "Албуми"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Грешка: Търсене за %s, неможе се намери възел %s в дървото."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Изглет като списък"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Име на файл"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Заглавие"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Изпълнител"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Изпълнител"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Албум"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Година"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Песен"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Ориг. изпълнител"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Права"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Деодирано от"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "Албуми"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "Файлове"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Едно ниво по-нагоре"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Задайте папка за търсене"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Изберете папка за претърсване!"
@@ -848,66 +865,66 @@ msgstr "Изберете папка за претърсване!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u файла"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Изпълнител и албум"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Преименува директория"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Преименува папката '%si' на : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Използва маска :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 #, fuzzy
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ако е активирано, ще се създаде плейлист в предходната директория"
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
 msgstr ""
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Невалидна маска на скенера"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Преглед на преименувания файл..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 #, fuzzy
 msgid "Error..."
 msgstr "Грешка в размера..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Трябва да въведете име на папката!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -942,14 +959,14 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -964,90 +981,90 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Папката преименувана"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Програма за стартиране :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Въведете програма за стартиране.Тя ще получи текущата директория като "
 "параметър"
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 #, fuzzy
 msgid "Open File with ..."
 msgstr "Отваряне на файл с..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Въведете програма за стартиране.Тя ще получи текущата директория като "
 "параметър"
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Трябва да въведете име на програма!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Неможе да се изпълни %s (%s)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Неможе да се повдигне друг процес!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Изпълнена команда : %s %s"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Изпълнител / Албум"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Категория"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Име на песен"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Продължителност"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Търсене в база данни на диск"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Автоматично търсене"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Заявка към FreeDB база данни"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 #, fuzzy
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
@@ -1056,17 +1073,17 @@ msgstr ""
 "Автоматична заявка към CDDB база данни използвайки избраните файлове "
 "(последователността е важна!) за да се генерира CddbIDСпира търсенето"
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 #, fuzzy
 msgid "Stop the search ..."
 msgstr " СПИРА търсенето... "
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1078,139 +1095,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Ръчно търсене"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Думи :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Въведете думи за търсене (отделени с интервал или плюс)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Търсене в:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Всички полета"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Друго"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Всички категории"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Блус"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Класическа музика"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Кънтри"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Фолк"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Джаз"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Друго"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr ""
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Реге"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Рок"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Песен от филм"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr ""
 "Включени са: фънк, соул джаз, рап, поп,  индустриялна музика, метъл и т.н."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "Филми, Шоута"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "Други, които не се вписват в горните категории"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Категории"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Резултати :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Търсене :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Въведете думите за да търсите в списъка по-долу"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Търси следващ"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Търси предишен"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Покажи само червените линии / Покажи всички линии"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr ""
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Завърта селекцията "
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Избира всички линии"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1220,36 +1237,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Постави посока :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Всичко"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Песен No."
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "Песни"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Изпълни текущият скенер за всеки файл"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1264,92 +1281,96 @@ msgstr ""
 "резултатите, вместо да използвате directly the position order.\" "
 "##########################"
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Зареди избраните линии или всички линии(ако няма избрани такива)"
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Готов за търсене..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
-"Албум: '%s', Изпълнител: '%s', Продължителност: '%s', година: '%s', жанр: '%"
-"s', ID: '%s"
+"Албум: '%s', Изпълнител: '%s', Продължителност: '%s', година: '%s', жанр: "
+"'%s', ID: '%s"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Завърта селекцията"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Сортиране по номер на песен"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Сортиране по име на песен"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr ""
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr ""
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Свързване към хост '%s' порт '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Неможе да се свърже с хост '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Свързан с хост '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Грешка при премахването на ID3v1 етикет на '%s' (%s)\n"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не може да се създаде или отвори файл '%s' (%s)\n"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Неможе да се зареди файла '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Изпращане на  заявка..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Неможе да се изпрати заявка (%s)!"
@@ -1358,91 +1379,92 @@ msgstr "Неможе да се изпрати заявка (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Получаване на информация ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Сървърът върна грешен отговор! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сървърът върна грешен отговор! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Съжалявам, уеб базираното търсене в момента не работи!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Намерени %d съответстващи албума"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Няма избрани файлове!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d файлове са избрани!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Готов за търсене..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Изпращане на  заявка (Cddbld: %s #песни: %d, дължина на диска: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Намерени %d съответстващи албума"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Неможе да се зареди файла '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Зареждане на списъка с песните от албума ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1451,7 +1473,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Запис на етикет от CDDB"
 
@@ -1713,7 +1735,7 @@ msgstr ""
 msgid "Browser"
 msgstr "Браузър"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Файл"
 
@@ -1727,11 +1749,11 @@ msgstr "Връзката към файла не съществува"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Слой ?"
 
@@ -1739,7 +1761,7 @@ msgstr "?, Слой ?"
 msgid "Bitrate:"
 msgstr ""
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1747,17 +1769,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Честота:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Начин:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1774,7 +1796,7 @@ msgid "Time:"
 msgstr "Време:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Етикет"
 
@@ -1803,332 +1825,352 @@ msgstr "Изпълнител"
 msgid "Tag selected files with this artist"
 msgstr "Поставя етикет на избраните файлове с този изпълнител"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Изпълнител"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Поставя етикет на избраните файлове с този изпълнител"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Албум:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Поставя етикет на избраните файлове с името на този албум"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "Диск"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Поставя етикет на избраните файлове с този номер на диск"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Година"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Поставя етикет на избраните файлове с тази година"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Песен #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Поставя етикет на избраните файлове с тези номера на песните"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Жанр"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Поставя етикет на избраните файлове с този жанр"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Коментар"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Поставя етикет на избраните файлове с този коментар"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Композитор:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Поставя етикет на избраните файлове с този композитор"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Ориг. изпълнител:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Поставя етикет на избраните файлове с този ориг. изпълнител"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Авторски права:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Поставя етикет на избраните файлове с тези авторски права"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Поставя етикет на избраните файлове с този URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Кодирано от:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr ""
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Картинки"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Картинки:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Можете да използвате с провлачване и пускане за добавяне на картинка"
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Поставя етикет на избраните файлове с тези картинки"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 "Добавяне на картинки към етикета(провлачване и пускане също е налично)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Премахва избраните картинки, освен всички."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Запазва избраните картинки на хард диска."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Поставя аксесоари на избраните картинки."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Избраните файлове с етикет с име на песен '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Премахва име на песен от избраните файлове"
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Избраните файлове с етикет с изпълнител '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Премахва изпълнител от избраните файлове."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Избраните файлове с етикет с изпълнител '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Премахва изпълнител от избраните файлове."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Избраните файлове с етикет с албум '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Премахнато името на албума от избраните файлове."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Избраните файлове с етикет с диск номер '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Премахва номер на диска от избраните файлове."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Избраните файлове с етикет с година '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Премахва година от избраните файлове."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Избраните файлове с етикет със заглавие като 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Избраните файлове с етикет със заглавие като 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Премахва номер на песен от избраните файлове."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Избраните файлове номерирани последователно"
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Избраните файлове с етикет с жанр '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Премахва жанр от избраните файлове"
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Избраните файлове с етикет с коментар '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Премахва коментар от избраните файлове."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Избраните файлове с етикет с композитор '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Премахва композитор от избраните файлове."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Избраните файлове с етикет с ориг. изпълнител '%s'"
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Премахва ориг. изпълнител от избраните файлове."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Избраните файлове с етикет с авторски права '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Премахва авторски права от избраните файлове."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Избраните файлове с етикет с URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Премахва URL от избраните файлове."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr ""
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Избраните файлове с етикет с картинки."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Премахва картинките от избраните файлове."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr ""
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Всички етикети бяха сканирани"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Всички етикети бяха премахнати"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Търсене за файлове ..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Всички файлове бяха запазени..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Всички файлове бяха частично изтрити..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Всички файлове бяха изтрити..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, fuzzy, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2137,17 +2179,17 @@ msgstr ""
 "Желаете ли да запишете етикета на файл\n"
 "'%s' ?Записва етикет..."
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 #, fuzzy
 msgid "Write Tag..."
 msgstr "Запис на етикет от CDDB"
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Преименува файл и папка..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2161,12 +2203,12 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "Преименува папка"
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2180,11 +2222,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Преименува файл..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2197,17 +2239,17 @@ msgstr ""
 "на \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Записване на етикета на '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Етикет(ите) са записани"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2216,21 +2258,21 @@ msgstr ""
 "Неможе да се запише етикета във файл '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Неможе да се запише етикета във файл '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Преименуване на файл '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2243,7 +2285,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2252,11 +2294,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Файлът не е преименуван..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2269,7 +2311,7 @@ msgstr ""
 "защото същият вече съществува:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2278,7 +2320,7 @@ msgstr ""
 "защото същият вече съществува:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2289,7 +2331,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2298,16 +2340,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Файлът '%s' е преименуван на '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Файловете са преименувани..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2318,7 +2360,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2327,18 +2369,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Файлът '%s' е преименуван на '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "Файловете са преименувани..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2351,7 +2393,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2360,12 +2402,12 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "Файлът не е преименуван..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2374,16 +2416,16 @@ msgstr ""
 "Наистина ли желаете да изтриете файла\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Изтриване на файл"
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Файлът '%s' бе изтрит"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2395,109 +2437,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Търсене в прогрес..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Файл: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Намерени %d файла в тази директория и поддиректориите."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Намерени %d файла в тази директория"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u файла"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Не са намерени файлове в тази директория и поддиректориите!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Не са намерени файлове в тази директория"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Търсене..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr " СПИРА търсенето... "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Изберете папка за претърсване!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Поставя етикет на избраните файлове с това поле"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Конвертира '_' и '%20' до интервали"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Ковертира ' ' до '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Всичко с главни букви"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Всичко с малки букви"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Първата буква е главна"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Първата буква във всички думи е главна"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Премахва интервали"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Вмъква интервал преди главна буква"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Премахва двоични интервали или подчертани думи"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Неправилно излизане! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Получен е сигнал %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2507,11 +2548,11 @@ msgstr ""
 "с gdb backtrace ('gdb easytag core' then 'bt' and 'l') и информация за "
 "възпроизвеждането й до <easytag at gmail.com>"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Неразпознат сигнал"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2530,11 +2571,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Нормално напускане."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 #, fuzzy
 msgid ""
 "Some files have been modified but not saved...\n"
@@ -2543,88 +2584,88 @@ msgstr ""
 "Някои файлове бяха променени, но бяха записани...\n"
 "Желаете ли да ги запазите, преди да смените директорията?Грешка..."
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 #, fuzzy
 msgid " Do you really want to exit the program? "
 msgstr ""
 "Наистина ли желаете да изтриете файла\n"
 "'%s' ?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 етикет"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis етикет"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis етикет"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE етикет"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 файл"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 файл"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis файл"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "Следващ файл"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC файл"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MousePack файл"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio файл"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "MP2 файл"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "MousePack файл"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Картинки"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2632,14 +2673,14 @@ msgid "%d kb/s"
 msgstr "%d кб/сек."
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2650,11 +2691,11 @@ msgstr ""
 "във системната кодова таблица\n"
 "(Опитайте да настроите системната променлива G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Превод на името на файла"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Името на файл '%s' превишава %d символа и ще бъде смалено!\n"
@@ -2679,54 +2720,54 @@ msgstr "Декодер:"
 msgid "Channels:"
 msgstr "Промени"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "Появи се грешка по време на отварянето на файл: '%s' (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ГРЕШКА: Провал при записване на коментар към файл '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Записан е етикет на '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Премахнат е етикет от '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Грешка при премахването на ID3v1 етикет на '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при премахване на ID3v2 етикет на  '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при обновяване на ID3v2 етикет на '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2741,84 +2782,84 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Грешка при обновяване на ID3v1 етикет на '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Обновен е етикет на '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Няма съобщени грешки"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Няма налична памет"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Няма налични данни за разбор"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Неправилно форматирани данни"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Няма наличен буфер за писане"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Буферът е твърде малък"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Невалидна рамка на ID"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Зададените полета не са намерени"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Непознат тип на полето"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Етикетът вече е прикрепен към файл"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Невалидна версия на етикет"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Няма наличен файл за разбор"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Опитва да се запише върху файл само за четене"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Грешка в компресията/декомпресията"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr " Непознато съобщение за грешка!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "Избира файл..."
@@ -2827,75 +2868,75 @@ msgstr "Избира файл..."
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Избира файл..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Избира директория..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "Търсене..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Неможе да се изпълни %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "Б"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "КБ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "МБ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "ГБ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "ТБ"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Възпроизвежда се плейлиста"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3U име на плейлист"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Използва име на директория"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Редактира маски"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Опции на плейлиста"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Влключва само избраните файлове"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 #, fuzzy
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
@@ -2905,53 +2946,53 @@ msgstr ""
 "В противен случай, ще се запишат всички файлове.Използва пълният път за "
 "файловете в плейлиста"
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 #, fuzzy
 msgid "Use full path for files in playlist"
 msgstr "Използва относителен път към файловете в плейлиста"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Използва относителен път към файловете в плейлиста"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Създава плейлист в предходната директория"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Ако е активирано, ще се създаде плейлист в предходната директория"
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Използва DOS разделител за директории"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Тази опция заменя UNIX разделителя на директории '/' с DOS разделител'\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Съдържание на плейлиста"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Записва само списък с файлове"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Записва информация използвайки име на файл"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Записва инфрормация използвайки:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2960,12 +3001,12 @@ msgstr ""
 "Плейлист '%s' вече съществува!\n"
 "Презаписване?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Записване на плейлист..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2974,117 +3015,117 @@ msgstr ""
 "Неможе да се запише плейлист '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Записан е плейлист '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "Диск"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Деодирано от"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Търсене за име на файл"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 "Въведете дума за търсене във файловете, или нищо, за да се покажат всички."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "Ð’ :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "Името на файла"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "Тагът"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Чуствителност към регистъра"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Намерени : %d file(s)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Зареждане на имената на файлове от TXT файл"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Файл :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Зареждане "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Потвърждаване за преименуване на файлове"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Поставя интервал преди главна буква"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Изтриване на тази линия"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Изтрива празните линии"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Влключва само избраните файлове"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Влключва само избраните файлове"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Презареждане"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Записва само списък с файлове"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Избира всички линии"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3093,20 +3134,20 @@ msgstr ""
 "текущият избран скенер ще бъде задействан (прозорецът на скенера трябва да е "
 "отворен)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Добавяне на празна линия"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Изтриване на тази линия"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Премества нагоре тази маска"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Премества надолу тази маска"
@@ -3188,12 +3229,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ГРЕШКА: Провал при отваряне на файл: '%s' като vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Внимание : Този Ogg Vorbis file '%s' съдържа ID3v2 етикет."
@@ -3791,7 +3832,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3804,7 +3845,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3952,24 +3993,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Подреждане на знаците за ID3 етикети"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Записва ID3v2 етикет"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Записва ID3v2 етикет"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3979,12 +4031,12 @@ msgstr ""
 "файловете."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "Описание:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3993,63 +4045,63 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Уникод  (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Деодирано от"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Кодова таблица използвана за да се запишат данните на етикет във файл"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr " Не "
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 етикет"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Записва ID3v1.x етикет"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4057,30 +4109,30 @@ msgstr ""
 "Ако е активирано ID3v1 етикет ще бъде добавен или обновен в края на "
 "MP3файловете."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Кодова таблица използвана за да се запишат данните на етикет във файл"
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Подреждане на знаците за ID3 етикети"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4089,31 +4141,31 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Кодова даблица използвана за да се четат данните за етикета във файл"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Скенер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Запълва скенера за етикети - конвертиране на символи"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Конвертира долна черта '_' и низове '%20' до интервал ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Конвертира интервал ' ' до долна черта '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4122,11 +4174,11 @@ msgstr ""
 "маска заскенера за етикети"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Преименува файловия скенер - конвертиране на символи"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4135,17 +4187,17 @@ msgstr ""
 "от скенера за файлове"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr ""
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4154,15 +4206,15 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Прозорец на скенера"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Отваря прозореца на скенера при стартиране"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4170,11 +4222,11 @@ msgstr ""
 "Активирайте тази опция за да се отваря автоматично прозреца на скенера "
 "когато EasyTAGсе стартира"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Прозореца на скенера е винаги отгоре"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4183,16 +4235,16 @@ msgstr ""
 "върхуглавният прозорец"
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Полета"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Презаписва полетата когато сканира етикет"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4200,11 +4252,11 @@ msgstr ""
 "Ако е активирано, скенерът ще замести съществуващият текст в полетата с нов "
 "Ако е деактивирано, сам празните полета на етикетите ще бъдат запълвани."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Запазва този текст като коментар по подразбиране :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4213,12 +4265,12 @@ msgstr ""
 "коментар използвайки 'Fill Tag' скенера."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Използва CRC32 като коментар по подразбиране (за файлове само с ID3 етикети)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4229,46 +4281,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD база данни"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Автоматично търсене"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Име :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Порт :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI път :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Настройки на сървъра"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CD база данни"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "CGI път :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4277,52 +4329,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Настройки на сървъра посредник"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Използва сървър посредник"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Активира настройките на сървъра посредник."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Име на хост :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Име на сървъра посредник."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Порт на сървъра посредник."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Потребителско име :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Потребителко име за сървъра посредник."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Парола :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Парола за сървъра посредник."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Списък с имена на песни"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4330,7 +4382,7 @@ msgstr ""
 "Избира съответния аудио файл (съобразно позицията или DLM ако са активирани "
 "по-долу)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4339,7 +4391,7 @@ msgstr ""
 "съответният аудио файл в главния списък също ще бъде избран."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4350,15 +4402,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Потвърждаване"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Потвърждаване за напускане на програмата"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4366,57 +4418,61 @@ msgstr ""
 "Ако е активирано, отваря диалогов прозорец за да се поиска потвърждение "
 "преди напускане на програмата."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Потвърждаване за запис на етикети"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Потвърждаване за преименуване на файлове"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Потвърджаване за изтриване на файлове"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Потвърждаване за писане на плейлисти"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Прилага промените (но не ги запазва) и затваря този прозорец"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Затваря този прозорец без запазване"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Запазва промените и затваря прозореца"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример : %.*d_-_Име_на_песен_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Промените са приложени"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Конфигурацията е запазена"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Конфигурацията е непроменена"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4427,57 +4483,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Това не е директория"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Запълва етикет"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Преименува файл и директория"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Индикатор на процеси"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Етикетът е успешно сканиран"
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Етикетът е успешно сканиран...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Грешка при сканиране: неможе да се намери сепаратор '%s'в '%s"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Неможе да конвертира името на файл '%s' в системната кодова таблица."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Новото име на файла е успешно сканирано..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Новото име на файла е успешно сканирано...(%s)"
@@ -4485,56 +4541,56 @@ msgstr "Новото име на файла е успешно сканирано
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Сканиране за файл и етикет"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Скенер :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Избира тип на скенер за ползване"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Отваря прозореца на скенера / Сканира избраните файлове"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Опции на скенера"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Показва / скрива редактора на маски"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Показва / скрива легенда"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Затваря този прозорец"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Запълва предварителния преглед на етикета..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Задава текущият път като префикс за маската"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4543,15 +4599,15 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Преглед на преименувания файл..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Избира файлове:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4560,126 +4616,136 @@ msgstr ""
 "Изберете тези, които ви интересуват."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "Ф"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Обработва полето за име на файл"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "З"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Обработва полето за заглавие"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "И"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Обработва полето за изпълнител"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Обработва полето за изпълнител"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "А"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Обработва полето за албум"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "Ж"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Обработва полето за жанр"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Коме"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Обработва полето за коментар"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Комп"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Обработва полето за композитор"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "Ор. Изп."
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Обработва полето за оригинален изпълнител"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Ав"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Обработва полето за авторско право"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Обработа полето за URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr ""
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Завърта селекцията"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Избира/ Не избира всички."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Конвертира '_' и '%20' до ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Конвертира :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "до : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4687,7 +4753,7 @@ msgstr ""
 "Знакът долна черта или низът '%20' са заменени от един интервал. Пример, "
 "преди: 'Текст%20В%20Един_Запис', след: 'Текст В Един Запис'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4695,16 +4761,16 @@ msgstr ""
 "Знакът интервал е заменен от долна черта. Пример, преди: 'Текст В Един "
 "Запис', след: 'Текст_В_Един_Запис'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4712,7 +4778,7 @@ msgstr ""
 "Конвертира всички букви във всички полета до главни букви. Пример, преди: "
 "'Текс В ЕДИН запис', след: 'ТЕКСТ В ЕДИН ЗАПИС'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4720,7 +4786,7 @@ msgstr ""
 "Конвертира всички букви във всички полета до малки букви. Пример, преди: "
 "'ТЕКСТ В един запис', след: 'текст в един запис'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4728,7 +4794,7 @@ msgstr ""
 "Конвертира първата буква във всички полета до главна буква. Пример, преди: "
 "'текст В Един ЗАПИС', след: 'Текст в един запис'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4736,7 +4802,7 @@ msgstr ""
 "Конвертира всяка първа буква до главна във всички полета. Пример, преди: "
 "'Текст в един ЗАПИС', след: 'Текст В Един Запис'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4745,15 +4811,15 @@ msgstr ""
 "Поставя интервал преди всяка главна буква. Пример, преди: 'ТекстВЕдинЗапис', "
 "след: 'Текст В Един Запис'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Поставя интервал преди главна буква"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Премахва дублиращи се интервали или главни букви"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4761,7 +4827,7 @@ msgstr ""
 "Всички интервали преди буквите се премахват. Пример, преди: 'Текст В Един "
 "Запис', след: 'ТекстВЕдинЗапис'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4769,7 +4835,7 @@ msgstr ""
 "Поставя интервал преди всяка главна буква. Пример, преди: 'ТекстВЕдинЗапис', "
 "след: 'Текст В Един Запис'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4780,185 +4846,190 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Легенда"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : изпълнител"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : изпълнител"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : албум"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : коментар"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : композитор"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : авторски права"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : номер на диск"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : кодирано от"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : жанр"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : игнорирано"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : номера на песни"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ориг. изпълнител"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : песен"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : заглавие"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : година"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Редактор на маски"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Създава нова маска"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Премества нагоре тази маска"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Премества надолу тази маска"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Дублира маска"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Добавя маски по подразбиране"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Премахва маска"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Запазва маска"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Нова_маска"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Копиране: няма избран ред!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Премахване: няма избран ред!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Преместване нагоре: няма избран ред"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Преместване надолу: няма избран ред!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ГРЕШКА: Не може да запиша конфигурационен файл: %s (%s)\n"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не може да отвори конфигурационен файл '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Зарежда конфигурация по подразбиране..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не може да се създаде или отвори файл '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ГРЕШКА: Не може да запиша конфигурационен файл: %s (%s)\n"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Зарежда настройки по подразбиране 'Запълва маската на етикет'..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Зарежда настройки по подразбиране 'Преименува маска на файл'..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Зарежда настройки по подразбиране 'Преименува маска на файл'..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ГРЕШКА: Променливата на обкръжението HOME не е дефинирана!\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ГРЕШКА: Не може да създаде директория '%s' (%s)!"
@@ -5304,8 +5375,8 @@ msgstr "Отваря програма за музика"
 #~ "check automatically the right encoding to use."
 #~ msgstr ""
 #~ "Ако е активирано, ID3 етикетите ще бъдат записвани с ISO-8859-1 "
-#~ "подреждане на знаците.Забележете, че ID3v2.3 етикетите поддържат само ISO-"
-#~ "8859-1 и UTF-16."
+#~ "подреждане на знаците.Забележете, че ID3v2.3 етикетите поддържат само "
+#~ "ISO-8859-1 и UTF-16."
 
 #, fuzzy
 #~ msgid "Use this character set translation for ID3 tags (for expert user) :"
@@ -5333,8 +5404,8 @@ msgstr "Отваря програма за музика"
 #~ "Invalid UTF-8"
 #~ msgstr ""
 #~ "Името на файл '%s' неможе да бъде конвертирано в UTF-8 (%s).\n"
-#~ "За да корегирате: името на този файл не трябва да бъде с кодиране на UTF-"
-#~ "8.Определите правилнотокодиране на името в променливата "
+#~ "За да корегирате: името на този файл не трябва да бъде с кодиране на "
+#~ "UTF-8.Определите правилнотокодиране на името в променливата "
 #~ "G_FILENAME_ENCODING (на пример : export G_FILENAME_ENCODING=ISO-8859-1).\n"
 #~ "Невалиден UTF-8"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index c2e8449..c78e689 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 65e9f1b..6fde460 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-09-29 14:05+0100\n"
 "Last-Translator: Zbynek Mrkvicka <zbynek at mrkvicka.eu>\n"
 "Language-Team: Czech <zbynek at mrkvicka.eu>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,6 +29,7 @@ msgstr ""
 "GTK+ rozhraním je tagování v GNU/Linuxu mnohem jednodušší."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Německý překlad)"
 
@@ -109,111 +111,111 @@ msgstr "Hebrejský překlad:"
 msgid "(Serbian translation)"
 msgstr "(Německý překlad)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Poznámka"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "O aplikaci..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "O aplikaci"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompilováno: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(používá: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Webová stránka: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Popis:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(podpora MP3 vypnuta)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(podpora ID3v2.3 tagů vypnuta)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Není dostupná žádná pamět"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(podpora Ogg Vorbis formátu vypnuta)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(podpora Speex formátu vypnuta)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(podpora FLAC formátu vypnuta)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(podpora MP4/AAC vypnuta)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(podpora WavPack formátu vypnuta)"
@@ -221,33 +223,33 @@ msgstr "(podpora WavPack formátu vypnuta)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Poděkování"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Překlady:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Obecné:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Změny"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Nelze otevřít soubor '%s' (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "CHYBA při otevírání souboru: '%s' (%s)."
@@ -255,484 +257,494 @@ msgstr "CHYBA při otevírání souboru: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Setřídit seznam podle tagu"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Setřídit seznam podle vlastnosti"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Vzestupně podle názvu souboru"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Sestupně podle názvu souboru"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Vzestupně podle data vytvoření"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Sestupně podle data vytvoření"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Vzestupně podle pořadí skladby"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Sestupně podle pořadí skladby"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Vzestupně podle názvu skladby"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Sestupně podle názvu skladby"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Vzestupně podle umělce"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Sestupně podle umělce"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Vzestupně podle umělce"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Sestupně podle umělce"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Vzestupně podle názvu alba"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Sestupně podle názvu alba"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "VzestupnÄ› podle roku"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "SestupnÄ› podle roku"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Vzestupně podle žánru"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Sestupně podle žánru"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Vzestupně podle poznámky"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Sestupně podle poznámky"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "VzestupnÄ› podle skladatele"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "SestupnÄ› podle skladatele"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Vzestupně podle původního umělce"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Sestupně podle původního umělce"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "VzestupnÄ› podle copyrightu"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "SestupnÄ› podle copyrightu"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "VzestupnÄ› podle URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "SestupnÄ› podle URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Vzestupně podle názvu enkodéru"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Sestupně podle názvu enkodéru"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "VzestupnÄ› podle typu souboru"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "SestupnÄ› podle typu souboru"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "VzestupnÄ› podle velikosti souboru"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "SestupnÄ› podle velikosti souboru"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Setřídit seznam vzestupně podle délky skladby"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Setřídit seznam sestupně podle délky skladby"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Setřídit seznam vzestupně podle bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Setřídit seznam sestupně podle bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Setřídit seznam vzestupně podle vzorkování"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Setřídit seznam sestupně podle vzorkování"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Otevřít soubor(y) s ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Označit všechny soubory"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Odznačit všechny soubory"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Invertovat výběr souborů"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Vymazat soubor(y)..."
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "P_rvní soubor"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "První soubor"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "_Předchozí soubor"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Předchozí soubor"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Další soubor"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Další soubor"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "Pos_lední soubor"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Poslední soubor"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "Na_skenovat soubor(y)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Naskenovat soubor(y)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Vymazat tag(y)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Vymazat tag(y)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "Vrátit poslední změny na souboru(ech)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Vrátit poslední změny na souboru(ech)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "Zopakovat poslední změny na soubo_ru(ech)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Zopakovat poslední změny na souboru(ech)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Uložit soubor(y)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Uložit soubor(y)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "Vynutit uložení souboru(ů)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Vynutit uložení souboru(ů)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Zrušit poslední změny"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Zopakovat poslední změny"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "U_končit"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Prohlížeč"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Přejít do _domovského adresáře"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Přejít do domovského adresáře"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Přejít do výchozího adresáře"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Přejít do domovského adresáře"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Přejít do domovského adresáře"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Přejít do domovského adresáře"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Přejít do _výchozího adresáře"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Přejít do výchozího adresáře"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Nastavit aktuální _cestu jako výchozí"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Nastavit aktuální cestu jako výchozí"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Stromová struktura | Zobrazení Autor-Album"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Přejmenovat adresář..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Obnovit adresář"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Procházet adresář s ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Zabalit strom"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Obnovit strom"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "S_kener"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Vyplnit tag(y)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Vyplnit tag(y)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "Přejmenovat soubo_r(y) a adresář..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Přejmenovat soubor(y) a adresář..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "Z_pracovat pole..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Zpracovat pole..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Ostatní"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Hl_edat soubor(y)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Hledat soubor(y)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Hledání v CD data_bázi..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB hledání..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Nahrát názvy souborů z TXT..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Zapsat seznam skladeb..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Spustit přehrávač"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "N_astavení"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Možnosti..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Možnosti..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "O _aplikaci"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Zastavit probíhající akci"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Souborové operace"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Hledat soubor(y) pomocí CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Vyčistit log"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Procházet _podadresáře"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Zobrazit skryté adresáře"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Zobrazit stromovou strukturu / Zobrazit podle Autora a Alba"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr ""
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Připraveno..."
 
@@ -741,7 +753,7 @@ msgid "New default path for files selected"
 msgstr "Vybrána nová výchozí cesta k souborům"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Potvrzení..."
 
@@ -753,87 +765,92 @@ msgstr ""
 "Některé soubory byly modifikovány, ale nebyly uloženy...\n"
 "Chcete je před změnou adresáře uložit?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<VÅ¡echna alba>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Chyba: Hledal jsem %s, nemohu nalézt uzel %s ve stromu."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Strom"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Název souboru"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Název"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Umělec"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Umělec"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Rok"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Pořadí"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Žánr"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Skladatel"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Původní umělec:"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Enkódováno"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Alba"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Soubory"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Přejít do nadřazeného adresáře"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Napište název adresáře."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Vyberte adresář, který se bude procházet!"
@@ -841,33 +858,33 @@ msgstr "Vyberte adresář, který se bude procházet!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u souborů"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Umělec & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Přejmenovat adresář"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Přejmenovat adresář '%s' na : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Použít masku :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Pokud je aktivováno, použijí se k přejmenování adresáře masky."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -875,31 +892,31 @@ msgstr ""
 "Vyberte nebo vepište masku z kódů (viz Legenda) pro přejmenování adresáře "
 "použitím polí tagu."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Chybná maska skeneru"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Náhled přejmenování adresáře..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Chyba..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Musíte vyplnit název adresáře!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "Nemohu převést '%s' do kódování názvu souboru. Použijte jiný název."
@@ -932,7 +949,7 @@ msgstr "Nemohu převést '%s' do kódování názvu souboru. Použijte jiný ná
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -941,7 +958,7 @@ msgstr ""
 "Nelze přejmenovat, protože adresář s tímto názvem již existuje!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -956,88 +973,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Adresář přejmenován"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Spustit program :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Napište název programu, který se spustí. Tomuto programu se předá aktuální "
 "adresář jako parametr."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Otevřít soubor s ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Napište název programu, který se spustí. Tomuto programu se předá aktuální "
 "soubor jako parametr."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Musíte vyplnit název programu!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Nemohu nalézt program '%s'!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nemohu spustit %s (chyba %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Nelze vytvořit proces!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Spuštěný příkaz : '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Umělec / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Kategorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Název skladby"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "ÄŒas"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Hledání v CD databázi..."
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatické hledání"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "Požadavek na CD databázi :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1045,16 +1062,16 @@ msgstr ""
 "Automaticky zaslat požadavek do CDDB databáze na základě vybraných souborů "
 "(pořadí je důležité) k vytvoření CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Zastavit hledání ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Použít lokální Cddb"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1065,138 +1082,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Manuální hledání"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Slova :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Napište slova, která chcete vyhledat (oddělená mezerou nebo '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Hledat v :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "VÅ¡echna pole"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Další"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "VÅ¡echny kategorie"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klasická hudba"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Ostatní"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "obsahuje : funk, soul, rap, pop, industrial, metal, atd."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "filmy, show"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "ostatní, které nepatří do zobrazených kategorií"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Kategorie"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Výsledky :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Hledat :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Napište slova, která chcete vyhledat v seznamu"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Hledat další"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Hledat předchozí"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Zobrazit pouze červené řádky (nebo všechny řádky) v seznamu 'Umělec / Album'"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Odznačit všechny řádky"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Invertovat výběr řádků"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Označit všechny řádky"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1208,36 +1225,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Nastavit do :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "VÅ¡e"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Pořadí #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# skladeb"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Spustí aktuální skener pro každý soubor"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1248,91 +1265,95 @@ msgstr ""
 "K porovnání a výběru CDDB titulu s názvem souboru se použije Levenshteinův "
 "algoritmus (DLM: Damerau-Levenshtein Metric)."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Načíst vybrané řádku nebo všechny řádky (pokud nejsou žádné vybrány)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Připraveno k vyhledání..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Album: '%s', umělec: '%s', délka: '%s', rok: '%s', žánr: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Setřídit podle pořadí skladby"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Setřídit podle názvu skladby"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Hledám server '%s' ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nemohu nalézt server '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Nelze vytvořit nový socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Probíhá připojování k '%s', port '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nelze se připojit k '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Připojeno k '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Přijímám data (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Chyba při načítán odpovědi cddb (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nelze vytvořit soubor '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nelze otevřít soubor '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Odesílání požadavku"
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nelze odeslat požadavek (%s)!"
@@ -1341,62 +1362,63 @@ msgstr "Nelze odeslat požadavek (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Přijímám data ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Server vrátil špatnou odpověď!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Server vrátil špatnou odpověď! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Webové vyhledávání právě není v provozu."
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Nalezeno %d odpovídajících alb"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Přijímám data %d ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Přijímám data %d ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Další výsledky k načtení ..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Nebyl vybrán soubor!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Bylo vyráno více než 99 souborů! Nelze zaslat požadavek!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "Vybráno %d souborů!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Lokální vyhledávání CD..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 #, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
@@ -1405,28 +1427,28 @@ msgstr ""
 "Cesta k 'Lokální  CD Databázi' nebyla definována!\n"
 "Vyplňte jí v okně nastavení."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Posílám požadavek (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Nalezeno %d odpovídajících alb pro DiscID '%s'"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Nelze načíst soubor '%s' (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Načítání skladeb z alba ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1439,7 +1461,7 @@ msgstr ""
 "\n"
 "Chcete pokračovat?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Zapsat tag z CDDB..."
 
@@ -1699,7 +1721,7 @@ msgstr "Neznámý parametr nebo cesta '%s'\n"
 msgid "Browser"
 msgstr "Prohlížeč"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Soubor"
 
@@ -1713,11 +1735,11 @@ msgstr "Vadný link na soubor"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Vrstva ?"
 
@@ -1725,7 +1747,7 @@ msgstr "?, Vrstva ?"
 msgid "Bitrate:"
 msgstr "Datový tok:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1733,17 +1755,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Vzorkování:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mód:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1760,7 +1782,7 @@ msgid "Time:"
 msgstr "ÄŒas:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Tag"
 
@@ -1789,45 +1811,56 @@ msgstr "Umělec:"
 msgid "Tag selected files with this artist"
 msgstr "Nastavit vybraným souborům tohoto umělce"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Umělec:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Nastavit vybraným souborům tohoto umělce"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Nastavit vybraným souborům tento název alba"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Nastavit vybraným souborům toto číslo disku"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Rok:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Nastavit vybraným souborům tento rok"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Očíslovat vybrané skladby sekvenčně. Začíná od 01 v každém podadresáři."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Pořadí #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1835,287 +1868,296 @@ msgstr ""
 "Nastavit počet souborů ve stejném adresáři jako zobrazený do pole počet "
 "skladeb."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Nastavit vybraným souborům tento počet skladeb"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Žánr:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Nastavit vybraným souborům tento žánr"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Poznámka:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Nastavit vybraným souborům tuto poznámku"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Skladatel:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Nastavit vybraným souborům tohoto skladatele"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Původní umělec:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Nastavit vybraným souborům tohoto původního umělce"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Nastavit vybraným souborům tento copyright"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Nastavit vybraným souborům tuto URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Enkódováno:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Nastavit vybraným souborům tento enkodér"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Obrázky"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Obrázky:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Pro přidání obrázku můžete použít drag and drop."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Nastavit vybraným souborům tyto obrázky"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Přidat obrázky do tagu (i drag and drop)"
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Odstranit vybrané obrázky, jinak všechny obrázky."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Uložit vybrané obrázky na pevný disk."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Nastavit vlastnosti vybraných obrázků."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Vybraným souborům byl nastaven název '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Z vybraných souborů byl vymazán název."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Vybraným souborům byl nastaven autor '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Z vybraných souborů byl vymazán autor."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Vybraným souborům byl nastaven autor '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Z vybraných souborů byl vymazán autor."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Vybraným souborům bylo nastaveno album '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Z vybraných souborů bylo vymazáno album."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Vybraným souborům bylo nastaveno číslo disku '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Z vybraných souborů bylo vymazáno číslo disku."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Vybraným souborům byl nastaven rok '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Z vybraných souborů byl vymazán rok."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Vybraným souborům bylo nastaveno pořadí 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Vybraným souborům bylo nastaveno pořadí 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Z vybraných souborů bylo vymazáno pořadí skladby."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Vybrané skladby byly sekvenčně očíslovány."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Vybraným souborům byl nastaven žánr '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Z vybraných souborů byl vymazán žánr."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Vybraným souborům byla nastavena poznámka '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Z vybraných souborů byla vymazána poznámka."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Vybraným souborům byl nastaven skladatel '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Z vybraných souborů byl vymazán skladatel."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Vybraným souborům byl nastaven původní umělec '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Z vybraných souborů byl vymazán původní umělec."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Vybraným souborům byl nastaven copyright '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Z vybraných souborů byl vymazán copyright."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Vybraným souborům byla nastavena URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Z vybraných souborů byla vymazána URL."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Vybraným souborům byl nastaven enkodér '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Z vybraných souborů byl vymazán enkodér."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Vybraným souborům byly nastaveny obrázky."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Z vybraných souborů byly vymazány obrázky."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Vyberte Mód a Masku, a zopakujte stejnou akci"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Všechny tagy byly naskenovány"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Všechny tagy byly vymazány"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Hledat soubor(y)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Všechny soubory byly uloženy..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Některé soubory nebyly vymazány..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Všechny soubory byly vymazány..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2124,16 +2166,16 @@ msgstr ""
 "Chcete zapsat tag do souboru\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Zapsat tag..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Přejmenovat soubor a adresář..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2147,11 +2189,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Přejmenovat adresář... "
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2165,11 +2207,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Přejmenovat soubor..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2182,17 +2224,17 @@ msgstr ""
 "na \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisování tagu do '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Tagy zapsány"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2201,21 +2243,21 @@ msgstr ""
 "Nelze zapsat tag do souboru '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Nelze zapsat tag do souboru '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Přejmenování souboru '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2228,7 +2270,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2237,11 +2279,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Soubor(y) nebyly přejmenovány..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2254,7 +2296,7 @@ msgstr ""
 "protože soubor stejného názvu již existuje:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2263,7 +2305,7 @@ msgstr ""
 "protože soubor stejného názvu již existuje:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2274,7 +2316,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2283,16 +2325,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Soubor '%s' přejmenován na '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Soubor(y) přejmenovány..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2303,7 +2345,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2312,17 +2354,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Soubor '%s' přejmenován na '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Soubor(y) přejmenovány..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2335,7 +2377,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2344,11 +2386,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Soubor(y) nebyl přesunut..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2357,16 +2399,16 @@ msgstr ""
 "Opravdu chcete definitivnÄ› vymazat soubor\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Vymazání souboru..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Soubor '%s' byl vymazán"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2378,109 +2420,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Probíhá hledání..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Soubor: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Nalezeno %d souborů v tomto adresáři a jeho podadresářích."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Nalezeno %d souborů v tomto adresáři."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u souborů"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nebyl nalezen žádný soubor v tomto adresáři a jeho podadresářích!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Nebyl nalezen žádný soubor v tomto adresáři!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Hledání..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  PŘERUŠIT vyhledávání...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Vyberte adresář, který se bude procházet!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Nastavit vybraným souborům tento název"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertovat '_' a '%20' na mezery"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Konvertovat ' ' na '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Všechno velkými písmeny"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Všechno malými písmeny"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "První písmeno velké"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "První písmeno každého slova velké"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Smazat mezery"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Vložit mezeru před velká písmena"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Vymazat dvojité mezery nebo podtržítka"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Nestandardní ukončení! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Zachycen signál %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2490,11 +2531,11 @@ msgstr ""
 "gdb výpisem zásobníku ('gdb easytag core' potom 'bt' a 'l') na adresu "
 "<easytag at gmail.com>"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Neznámy signál"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2527,11 +2568,11 @@ msgstr ""
 "., ./             Načte aktuální adresář.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Standardní ukončení"
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2539,82 +2580,82 @@ msgstr ""
 "Některé soubory byly modifikovány, ale nebyly uloženy...\n"
 "Chcete je před ukončením programu uložit ?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Opravdu chcete ukončit program? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 Tag"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis Tag"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Tag"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE Tag"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC Tag"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack Tag"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 soubor"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 soubor"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis soubor"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Soubor Speex"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC soubor"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack soubor"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey Audio soubor"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC soubor"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack soubor"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Obrázky (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2622,14 +2663,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2640,11 +2681,11 @@ msgstr ""
 "do systémového kódování\n"
 "(Zkuste nastavit proměnnou prostředí G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Překlad názvu souboru"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Název souboru '%s' překročil %d znaků a proto bude zkrácen!\n"
@@ -2668,54 +2709,54 @@ msgstr "Enkodér:"
 msgid "Channels:"
 msgstr "Channels:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "CHYBA při otevírání souboru: '%s' jako FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "CHYBA: Selhalo zapsání komentářů do souboru '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Zapsán tag do '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Vymazán tag z '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Chyba při mazání ID3v1 tagu v '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Chyba při mazání ID3v2 tagu v '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Chyba při úpravě ID3v2 tagu v  '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2730,77 +2771,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Chyba při úpravě ID3v1 tagu v  '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Upraven tag v '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Neohlášena žádná chyba"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Není dostupná žádná pamět"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Žádná data pro parsování"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Chybně zformátovaná data"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Nebyl nalezen buffer pro zápis"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Buffer je přlož nový"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Chybné ID rámce"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Požadované pole nebylo nalezeno"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Neznámé pole"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Tag v souboru již je"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Chybná verze tagu"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Nebyl nalezen soubor pro parsování"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Pokus o zápis do read-only souboru"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Chyba při kompresi/dekompresi"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Neznámá chyba!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2809,7 +2850,7 @@ msgstr ""
 "Protože by následující poškozený soubor: '%s'\n"
 "způsobil chybu v id3lib, nebude programem zpracován."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Poškozený soubor..."
 
@@ -2817,74 +2858,74 @@ msgstr "Poškozený soubor..."
 msgid "Log"
 msgstr "Log"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Vybrat soubor..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Vybrat adresář..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Varování..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Nebyl nastaven audio přerávač!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Nemohu spustit %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Vygenerovat seznam skladeb"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Název seznamu M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Použít název adresáře"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Upravit masku"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Možnosti seznamu skladeb"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Zahrnout pouze vybrané soubory"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2892,30 +2933,30 @@ msgstr ""
 "Pokud je aktivováno, budou do seznamu skladeb zapsány pouze vybrané soubory. "
 "Jinak budou zapsány všechny soubory."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Použít celou cestu k souborům v seznamu"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Použít relativní cestu k souborům v seznamu"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Vytvořit seznam skladeb v nadřazeném adresáři"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Pokud je aktivováno, bude se seznam skladeb vytvářet v nadřazeném adresáři."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Používat DOSovský oddělovač adresářů"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2923,23 +2964,23 @@ msgstr ""
 "Tato volba nahrazuje UNIXovský oddělovač adresářů '/' na DOSovský oddělovač "
 "'\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Obsah seznamu skladeb"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Zapsat jen seznam souborů"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Zapsat informace za použití názvu souboru"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Zapsat informace za použití:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2948,12 +2989,12 @@ msgstr ""
 "Soubor seznamu skladeb '%s' již existuje!\n"
 "Přepsat?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Zapsat seznam skladeb..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2962,24 +3003,24 @@ msgstr ""
 "Nelze zapsat do souboru seznamu skladeb '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapsán soubor seznamu skladeb '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Enkódováno"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Najít soubor"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2987,93 +3028,93 @@ msgstr ""
 "všech souborů."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "V :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "Název souboru"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "Tag"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Rozlišovat velikost písmen"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Nalezeno %d souborů"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Nahrát názvy souborů z TXT souboru."
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Soubor :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Nahrát "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Potvrdit přejmenování souboru"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Vkládat mezeru před velká písmena"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Vymazat tento řádek"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Vymazat všechny prázdné řádky"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Zahrnout pouze vybrané soubory"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Zahrnout pouze vybrané soubory"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Obnovit"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Zapsat jen seznam souborů"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Označit všechny řádky"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3081,20 +3122,20 @@ msgstr ""
 "Při spuštění této volby, po načtení názvů souboru, bude spuštěn aktuální "
 "skener (okno skeneru musí být otevřeno)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Vložit prázdný řádek"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Vymazat tento řádek"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Posunout masku nahoru"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Posunout masku dolů"
@@ -3179,12 +3220,12 @@ msgstr ""
 "Ogg Vorbis: vnitřní logická chyba signalizující bug, nebo poškození "
 "zásobníku (soubor: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "CHYBA: Selhalo otevření souboru: '%s' jako vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Varování : Soubor Ogg Vorbis '%s' obsahuje ID3v2 tag."
@@ -3774,16 +3815,16 @@ msgid ""
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
-"S touto možností se zkusí převod do kódové stránky vašeho locale (např.: ISO-"
-"8859-1 pro 'fr', KOI8-R pro 'ru', ISO-8859-2 pro 'ro'). Pokud se to nezdaří, "
-"zkusí se kódová stránka ISO-8859-1."
+"S touto možností se zkusí převod do kódové stránky vašeho locale (např.: "
+"ISO-8859-1 pro 'fr', KOI8-R pro 'ru', ISO-8859-2 pro 'ro'). Pokud se to "
+"nezdaří, zkusí se kódová stránka ISO-8859-1."
 
 #: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Vynutit systémovou znakovou sadu a aktivovat transliteraci"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3798,7 +3839,7 @@ msgid ""
 "characters"
 msgstr "Vynutit systémovou znakovou sadu a zahazovat některé znaky"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3948,22 +3989,33 @@ msgstr "Použít kompresi"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Nastavit kompresi ID3v2 tagů"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Znaková sada pro ID3 tagy"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2 tagy"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Zapisovat ID3v2 tag"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3972,11 +4024,11 @@ msgstr ""
 "ID3v2 tag. V opačném případě bude odstraněn."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Verze:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3985,34 +4037,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Znaková sada:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Použít typ Unicode"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Znaková sada použitá pro zápis dat tagu do souboru."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Další nastavení pro iconv():"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Ne"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4022,25 +4074,25 @@ msgstr ""
 "Pokud nemůže být znak reprezentován v cílové znakové sadě, může být nahrazen "
 "jedním nebo několika přibližně podobnými znaky."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1 tagy"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Zapisovat ID3v1.x tag"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4048,28 +4100,28 @@ msgstr ""
 "Pokud je zapnuto, bude se na konec MP3 souborů přidávat nebo upravovat ID3v1 "
 "tag. V opačném případě bude odstraněn."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Znaková sada pro zápis ID3v1 tagů do souboru."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Znaková sada pro čtení ID3 tagů"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Nestandardní:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4078,31 +4130,31 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Znaková sada použitá pro čtení dat tagu v souboru."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Skener"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Vyplnění tagu - Konverze znaků"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertovat podtržítko '_' a řetězec '%20' na mezeru ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertovat mezeru ' ' na podržítko '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4110,11 +4162,11 @@ msgstr ""
 "Pokud je zapnuto, bude se při aplikaci masky na tagy používat tato konverze."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Přejmenování souboru - Konverze znaků"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4123,17 +4175,17 @@ msgstr ""
 "konverze."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Skenování tagu - Úpravy - Konverze znaků"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Nekonvertovat první písmena slov na velká v případě předložek."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4144,26 +4196,26 @@ msgstr ""
 "feat., když používáte možnost 'První písmeno každého slova velké'."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Okno skeneru"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Otevřít okno skeneru při startu"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 "Zapněte tuto volbu pro automatické otevření okna skeneru při startu EasyTAGu."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Okno skeneru bude vždy navrchu"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4171,16 +4223,16 @@ msgstr ""
 "Pokud je zapnuto, okno s maskami zůstane vždy nad hlavním oknem programu."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Pole"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Přepsat pole při skenování tagu"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4188,11 +4240,11 @@ msgstr ""
 "Pokud je zapnuto, skener přepíše existující text v polích novou hodnotou. "
 "Pokud je vypnuto, budou vyplněny pouze prázdná pole tagu."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Nastavit tento text jako výchozí poznámku:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4201,11 +4253,11 @@ msgstr ""
 "do pole poznámky při použití možnosti 'Naplň tag'."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "Použít CRC32 jako výchozí komentář (jen pro soubory s ID3 tagem)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4216,42 +4268,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD databáze"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Nastavení serveru pro automatické hledání"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Název :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI Cesta :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Nastavení serveru pro manuální hledání"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Lokální CD databáze"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Cesta :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4263,59 +4315,59 @@ msgstr ""
 "'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' a 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Nastavení proxy"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Použít proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Pro připojení k serveru používat proxy."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Server :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Název proxy serveru."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Port proxy serveru."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Login :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Jméno uživatele pro proxy serveru."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Heslo :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Heslo uživatele pro proxy server."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Seznam názvů skladeb"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 "Vybrat příslušný soubor (podle pozice nebo DLM pokud je aktivováno níže)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4324,7 +4376,7 @@ msgstr ""
 "vybrán i odpovídající řádek v hlavním seznamu."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4335,15 +4387,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Potvrzování"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Potvrdit opuštění programu"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4351,57 +4403,61 @@ msgstr ""
 "Pokud je zapnuto, otevře se dialogové okno s potvrzením při zavírání "
 "programu."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Potvrdit zápis tagu do souboru"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Potvrdit přejmenování souboru"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Potvrdit smazání souboru"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Potvrdit zápis seznamu skladeb."
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Použije změny (ale neuloží) a zavře okno"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Zavře toto okno bez uložení"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Uloží změny a zavře toto okno"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Příklad : %.*d_-_Nazev_stopy_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Změny byly použity"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Konfigurace uložena"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Konfigurace nebyla změněna"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4412,57 +4468,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Není adresář"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Nemohu nalézt audio přehrávač '%s'!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Vyplnit tag"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Přejmenovat soubor a adresář"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Upravit"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Tag byl úspěšně naskenován..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag byl úspěšně naskenován...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr "Skener: oops..., přípona '%s' nebyla v názvu souboru '%s' nalezena!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Chyba skenování: nelze nalézt oddělovač '%s' před '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Nemohu převést název souboru '%s' do systémového kódování."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Nový název souboru byl úspěšně naskenován..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nový název souboru byl úspěšně naskenován...(%s)"
@@ -4470,41 +4526,41 @@ msgstr "Nový název souboru byl úspěšně naskenován...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Skenování tagu a názvu souboru"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Skener :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Vyberte druh skenování"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Otevřít okno skeneru / Naskenovat označené soubory"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Možnosti skenování"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Zobrazit / Skrýt editor masky"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Zobrazit / Skrýt legendu"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Zavřít toto okno"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4513,15 +4569,15 @@ msgstr ""
 "budou plnit pole tagu z názvu souboru a cesty."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Náhled tagu..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4534,15 +4590,15 @@ msgstr ""
 "absolutní cestu, jinak je cesta relativní."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Náhled nového názvu souboru..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Vyberte pole:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4551,126 +4607,136 @@ msgstr ""
 "které chcete upravit."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "S"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Upravit pole názvu souboru"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "N"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Upravit název skladby"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Au"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Upravit autora"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Upravit autora"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Upravit album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Upravit pole žánru"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "P"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Upravit poznámku"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "S"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Upravit pole skladatele"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "P"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Upravit pole původního umělce"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Upravit pole copyrightu"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Upravit pole URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Upravit pole názvu enkodéru"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Označit/Odznačit vše."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertovat '_' a '%20' na mezery"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Konvertovat :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "na : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4678,7 +4744,7 @@ msgstr ""
 "Podtržítka nebo řetězec '%20' budou nahrazovány jednou mezerou. Příklad, "
 "před: 'Text%20In%20An_Entry', po: 'Text In An Entry'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4686,16 +4752,16 @@ msgstr ""
 "Mezera bude nahrazována jedním podtržítkem. Příklad, před: 'Text In An "
 "Entry', po: 'Text_In_An_Entry'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4703,7 +4769,7 @@ msgstr ""
 "Všechna slova budou převedena na velká písmena. Příklad, před: 'Text IN AN "
 "entry', po: 'TEXT IN AN ENTRY'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4711,7 +4777,7 @@ msgstr ""
 "Všechna slova budou převedena na malá písmena. Příklad, před: 'TEXT IN an "
 "entry', po: 'text in an entry'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4719,7 +4785,7 @@ msgstr ""
 "První písmeno prvního slova bude převedeno na velké. Příklad, před: 'text IN "
 "An ENTRY', po: 'Text in an entry'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4727,7 +4793,7 @@ msgstr ""
 "První písmeno každého slova bude převedeno na velké. Příklad, před: 'Text in "
 "an ENTRY', po: 'Text In An Entry'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4736,15 +4802,15 @@ msgstr ""
 "Před každé velké písmeno bude vložena mezera. Příklad, před: "
 "'TextInAnEntry', po: 'Text In An Entry'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Vkládat mezeru před velká písmena"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Odstranit dvojité mezery nebo podtržítka"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4752,7 +4818,7 @@ msgstr ""
 "Mezery mezi slovy budou odstraňovány. Příklad, před: 'Text In An Entry', po: "
 "'TextInAnEntry'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4760,7 +4826,7 @@ msgstr ""
 "Před každé velké písmeno bude vložena mezera. Příklad, před: "
 "'TextInAnEntry', po: 'Text In An Entry'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4771,183 +4837,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : autor"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : autor"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : poznámka"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : skladatel"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : copyright"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : číslo disku"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : enkódoval"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : žánr"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorováno"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : počet skladeb"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : pův. umělec"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : pořadí"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : název"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : rok"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Editor masky"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Vytvořit novou masku"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Posunout masku nahoru"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Posunout masku dolů"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Duplikovat masku"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Přidat základní masky"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Odebrat masku"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Uložit masky"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nová_maska"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Kopírování: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Odebrání: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Posun nahoru: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Posun dolů: Nebyl vybrán žádný řádek!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "CHYBA: Nemohu zapsat konfigurační soubor: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nelze načíst konfigurační soubor '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Načítá se výchozí konfigurace..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nelze vytvořit nebo otevřít soubor '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "CHYBA: Nemohu zapsat seznam do souboru: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Načítám výchozí masky pro vyplnění tagů..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Načítám výchozí masky pro přejmenování souborů..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Načítám výchozí masky pro přejmenování adresářů..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "CHYBA: Proměnná prostředí HOME není definována!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "CHYBA: Nelze vytvořit adresář '%s' (%s)!"
diff --git a/po/da.gmo b/po/da.gmo
index a65440b..3096254 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 6aca3b2..38bdf87 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag 1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2005-12-18 14:36+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten at wtf.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 "lækker GTK+ grænseflade, som gør mærkning nemmere under GNU/Linux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Tysk oversættelse)"
 
@@ -113,111 +115,111 @@ msgstr "(Græsk oversættelse)"
 msgid "(Serbian translation)"
 msgstr "(Tysk oversættelse)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Kommentar"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Om..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Om"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompileret: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(bruger: GTK+ %d.%d.%d og id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Forfatter: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Hjemmeside: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Beskrivelse:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Ingen tilgængelige hukommelse"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis filunderstøttelse slået fra)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(FLAC filunderstøttelse slået fra)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(MP4/AAC filunderstøttelse slået fra)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
@@ -225,33 +227,33 @@ msgstr "(MP3 filunderstøttelse slået fra)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Tak"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Oversættelser:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Generelt:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Ændringer"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Kan ikke åbne fil '%s' (%s)"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "FEJL ved åbning af fil: '%s' (%s)."
@@ -259,484 +261,494 @@ msgstr "FEJL ved åbning af fil: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Fil"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Sortér liste efter mærke"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Sortér liste efter egenskab"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Filnavn opadgående"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Filnavn nedadgående"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Oprettelsesdato opadgående"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Oprettelsesdato nedadgående"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Spornummer opadgående"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Spornummer nedadgående"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Titel opadgående"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Titel nedadgående"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Kunstner opadgående"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Kunstner nedadgående"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Kunstner opadgående"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Kunstner nedadgående"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Album opadgående"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Album nedadgående"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "År opadgående"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "År nedadgående"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Genre opadgående"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Genre nedadgående"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Kommentar opadgående"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Kommentar nedadgående"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Komponist opadgående"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Komponist nedadgående"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Original kunstner opadgående"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Original kunstner nedadgående"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Ophavsret opadgående"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Ophavsret nedadgående"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "URL opadgående"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "URL nedadgående"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Encoder-navn opadgående"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Encoder-navn nedadgående"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Filtype opadgående"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Filtype nedadgående"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Filstørrelse opadgående"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Filstørrelse nedadgående"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Længde opadgående"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Længde nedadgående"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Bithastighed opadgående"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Bithastighed nedadgående"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Samplerate opadgående"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Samplerate nedadgående"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Ã…bn fil(er) med ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Vælg alle filer"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Fravælg alle filer"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Invertér filvalg"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Slet fil(er)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Første fil"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Første fil"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "_Forrige fil"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Forrige fil"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Næste fil"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Næste fil"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Sidste fil"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Sidste fil"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "S_can fil(er)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Scan fil(er)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Fjern mærke(r)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Fjern mærke(r)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Fortryd ændringer på sidste fil(er)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Fortryd ændringer på sidste fil(er)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Omgør ændringer på sidste fil(er)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Omgør ændringer på sidste fil(er)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Gem fil(er)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Gem fil(er)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "_Tving gemning af fil(er)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Tving genmning af fil(er)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Fortryd sidste ændringer"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Omgør sidste ændringer"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Browser"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "GÃ¥ til _hjemmemappe"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "GÃ¥ til hjemmemappe"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "GÃ¥ til standardmappe"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "GÃ¥ til hjemmemappe"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "GÃ¥ til hjemmemappe"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "GÃ¥ til hjemmemappe"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "GÃ¥ til _standardmappe"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "GÃ¥ til standardmappe"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Sæt _nuværende sti som standard"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Sæt nuværende sti som standard"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Træ-visning | Kunstner-Album-visning"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Omdøb mappe ..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Genindlæs mappe"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Gennemse mappe med ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Kollaps træ"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Opdatér træ"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "S_canner"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Udfyld mærke(r) ..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Udfyld mærke(r) ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Omdøb fil(er) og mappe ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Omdøb fil(er) og mappe ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Behandl felt(er) ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Behandl felt(er) ..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Diverse"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Søg _fil(er) ..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Søg fil(er)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "CDDB søgning ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB søgning ..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Hent filnavne fra TXT ..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Skriv spilleliste ..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Kør musikafspiller"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Opsætning"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Indstillinger ..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Indstillinger ..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Om"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Stop den nuværende handling"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Filhandlinger"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "CDDB søg fil(er)..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Gennemse _undermapper"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Vis skjule mapper"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Vis træ-browser / Vis ved kunstner og album"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Kunne ikke flette UI, fejl var: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Klar til at starte..."
 
@@ -745,7 +757,7 @@ msgid "New default path for files selected"
 msgstr "Ny standardsti for filer valgt"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Bekræft..."
 
@@ -757,88 +769,93 @@ msgstr ""
 "Nogle filer er blevet ændret, men ikke gemt...\n"
 "Vil du gemme dem, før du ændrer mappe?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Albums"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Fejl: Søgning efter %s, kunne ikke finde node %s i træ."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Træ"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Filnavn"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Titel"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Kunstner"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Ã…r"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Spor"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Genre"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Orig. kunstner"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Ophavsret"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Encoded af"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Albums"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Filer"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "GÃ¥ et niveau op"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Indtast en mappe at gennemse."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Vælg en mappe at gennemse!"
@@ -846,33 +863,33 @@ msgstr "Vælg en mappe at gennemse!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u fil(er)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Kunstner & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Omdøb mappen"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Omdøb mappen '%s' til : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Brug maske :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Hvis aktiveret, vil masker blive brugt til at omdøbe mappen."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -880,31 +897,31 @@ msgstr ""
 "Vælg eller indtast en maske vha. koder (se signatur i skannervinduet) til at "
 "omdøbe mappen fra mærke-felter."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Ugyldig scanner maske"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Omdøb mappeforvisning..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Fejl..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Du skal indtaste et mappenavn!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "Kunne ikke konvertere '%s' til filnavnets tegnsæt. Brug et andet navn."
@@ -937,7 +954,7 @@ msgstr "Kunne ikke konvertere '%s' til filnavnets tegnsæt. Brug et andet navn."
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -946,7 +963,7 @@ msgstr ""
 "Kan ikke omdøbe fordi det mappenavn allerede findes!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -961,89 +978,89 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Mappe omdøbt"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Program der skal køres :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Indtast programmet der skal køres. Det vil modtage den nuværende mappe som "
 "parameter."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Ã…bn fil med ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Indtast programmet der skal køres. Det vil modtager den nuværende fil som "
 "parameter."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Du skal indtaste et programnavn!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Programmet '%s' blev ikke fundet!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kan ikke køre %s (fejl %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Kan ikke 'fork' endnu en process!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Kørte kommando : '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Kunstner / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Kategori"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Spornavn"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Tid"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "CDDB søgning"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatisk søgning"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Send anmodning til FreeDB database:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1051,16 +1068,16 @@ msgstr ""
 "Anmod automatisk CDDB-databasen med de valgte filer (rækkefølgen er vigtig!) "
 "for at generere CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Stop søgningen ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1071,15 +1088,15 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Manuel søgning"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Ord :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 "Indtast ordene der skal søges efter (separeret med mellemrum eller '+')"
@@ -1087,123 +1104,123 @@ msgstr ""
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Søg i :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Alle felter"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Andre"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Alle kategorier"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klassisk"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folkesang"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inkluderet : funk, soul, rap, pop, industrial, metal, osv."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "film, shows"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "andre der ikke passer ind i ovenstående kategorier"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Kategorier "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Resultater :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Søg :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Indtast ordene at søge efter i listen forneden"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Søg næste"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Søg forrige"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Vis kun røde linjer/ Vis alle linjer"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Fravælg alle linjer"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Invertér linjevalg"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Vælg alle linjer"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1216,36 +1233,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Sæt ind i :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Alle"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Spor #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Spor"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Kør den nuværende scanner for hver enkel fil"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1259,91 +1276,95 @@ msgstr ""
 "Dette vil blive brugt når der bliver valgt en tilsvarende lydfil, eller "
 "anvendelse af cddb-resulatater, i stedet for at bruge positionsrækkefølgen."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Indlæs de valgte linjer eller alle linjer (hvis ingen linje valgt)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Klar til at søge..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Album: '%s', kunstner: '%s', længde: '%s', år: '%s', genre: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Invertér valg"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Sortér efter spornummer"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Sortér efter spornavn"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Slår værtsnavn '%s' op ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kunne ikke slå værtsnavn '%s' op (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Kan ikke oprette en ny socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Forbinder til vært '%s', port '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan ikke forbinde til vært '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Forbundet til vært '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fejl under fjernelse af ID3v1 mærke på '%s' (%d)\n"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan ikke oprette eller åbne fil '%s' (%s)\n"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Kan ikke åbne fil '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Sender anmodning ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kunne ikke sende anmodning (%s)!"
@@ -1352,91 +1373,92 @@ msgstr "Kunne ikke sende anmodning (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Modtager data ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Serveren returnerede forkert svar! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serveren returnerede forkert svar! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Desværre, web-baseret søgning virker ikke i øjeblikket!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Fandt %d matchende album(s)"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Ingen filer valgt!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fil(er) valgt"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Klar til at søge..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Sender anmodning (CddbId: %s, #tracks: %d, disk længde: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Fandt %d matchende album(s)"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Kan ikke åbne fil '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Henter albums sporliste ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1449,7 +1471,7 @@ msgstr ""
 "\n"
 "Vil du fortsætte?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Skriver mærke fra CDDB..."
 
@@ -1707,7 +1729,7 @@ msgstr ""
 msgid "Browser"
 msgstr "Browser"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Fil"
 
@@ -1721,11 +1743,11 @@ msgstr "Fillænke ødelagt"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1733,7 +1755,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "Bithastighed:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1741,17 +1763,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frek:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1768,7 +1790,7 @@ msgid "Time:"
 msgstr "Tid:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Mærke"
 
@@ -1797,46 +1819,57 @@ msgstr "Kunstner:"
 msgid "Tag selected files with this artist"
 msgstr "Mærk valgte filer med denne kunstner"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Kunstner:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Mærk valgte filer med denne kunstner"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Mærk valgte filer med dette albumnavn"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Mærk valgte filer med dette disknummer"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Ã…r:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Mærk valgte filer med dette år"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Giv numre til valgte spor sekventielt. Starter ved 01 i hver undermappe."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Spor #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1844,287 +1877,296 @@ msgstr ""
 "Sæt antallet af filer, i den samme mappe som den viste fil, til det valgte "
 "antal spor."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Mærk valgte filer med dette antal spor"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Mærk valgte filer med denne genre"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Mærk valgte filer med denne kommentar"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Komponist:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Mærk valgte filer med denne komponist"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Orig. kunstner:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Mærk valgte filer med denne originale kunstner"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Ophavsret:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Mærk valgte filer med denne ophavsret"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Mærk valgte filer med denne URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Encoded af:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Mærk valgte filer med denne encoders navn"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Billeder"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Billeder:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Du kan bruge træk-og-slip for at tilføje et billede."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Mærk valgte filer med disse billeder"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Tilføj billeder til mærket (træk-og-slip kan også bruges)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Fjern valgte billeder, ellers alle billeder."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Gem de valgte billeder på harddisken."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Sæt egenskaber på valgte billeder."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Valgte filer mærket med titlen '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Fjernede titel fra valgte filer."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Valgte filer mærket med kunstneren '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Fjernede kunstner fra valgte filer."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Valgte filer mærket med kunstneren '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Fjernede kunstner fra valgte filer."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Valgte filer mærket med album '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Fjernede albumnavn fra valgte filer."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Valgte filer mærket med disknummer '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Fjernede disknummer fra valgte filer."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Valgte filer mærket med år '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Fjernede år fra valgte filer."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Valgte filer mærket med spor som 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Valgte filer mærket med spor som 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Fjernede spornummer fra valgte filer."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Valgte spor givet numre sekventielt."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Valgte filer mærket med genre '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Fjernede genre fra valgte filer."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Valgte filer mærket med kommentar '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Fjernede kommentar fra valgte filer."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Valgte filer mærket med komponist '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Fjernede komponist fra valgte filer."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Valgte filer mærket med original kunstneren '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Fjernede original kunstner fra valgte filer."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Valgte filer mærket med ophavsret '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Fjernede ophavsret fra valgte filer."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Valgte filer mærket med URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Fjernede URL fra valgte filer."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Vælg filer mærker med encoder-navn '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Fjern encoder-navn fra valgte filer."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Valgte filer mærket med billeder."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Fjernede billeder fra valgte filer."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Vælg mode og maske, og omgør den samme handling"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Alle mærker er blevet scannet"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Alle mærker er blevet fjernet"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Søg fil(er)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Alle filer er blevet gemt..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Filer er blevet delvist slettet..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Alle filer er blevet slettet..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2133,16 +2175,16 @@ msgstr ""
 "Vil du skrive mærket på filen\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Skriv mærke..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Omdøb fil og mappe..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2157,11 +2199,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Omdøb mappe ..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2175,11 +2217,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Omdøb fil..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2192,17 +2234,17 @@ msgstr ""
 "til \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Skriver mærker på '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Mærke(r) skrevet"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2211,21 +2253,21 @@ msgstr ""
 "Kan ikke skrive mærke til fil '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Kan ikke skrive mærke til fil '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Omdøber fil '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2238,7 +2280,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2247,11 +2289,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Fil(er) ikke omdøbt..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2264,7 +2306,7 @@ msgstr ""
 "fordi den følgende fil allerede eksisterer:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2273,7 +2315,7 @@ msgstr ""
 "fordi den følgende fil allerede eksisterer:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2284,7 +2326,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2293,16 +2335,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Omdøbte fil '%s' til '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Fil(er) omdøbt..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2313,7 +2355,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2322,17 +2364,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Flyttede fil '%s' til '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Fil(er) flyttet..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2345,7 +2387,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2354,11 +2396,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Fil(er) ikke flyttet"
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2367,16 +2409,16 @@ msgstr ""
 "Vil du virkelig slette filen\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Slet fil..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fil '%s' slettet"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2388,109 +2430,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Søgning i gang..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Fil: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Fandt %d fil(er) i denne mappe og undermapper."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Fandt %d fil(er) i denne mappe."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fil(er)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Ingen filer fundet i denne mappe og undermapper!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Ingen fil fundet i denne mappe!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Søger..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  STOP søgningen...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Vælg en mappe at gennemse!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Mærk valgte filer med dette felt"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertér '_' og '%20' til mellemrum"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Konvertér ' ' til '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Alle store bogstaver"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "All små bogstaver"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Første bogstav stort"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Første bogstav stort på hvert ord"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Fjern mellemrum"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Indsæt mellemrum før store bogstaver"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Fjern dubletter af mellemrum og underscores"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Unormal afslutning! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Modtog signal %s (%d)\a\n"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2500,11 +2541,11 @@ msgstr ""
 "backtrace ('gdb easytag core', så 'bt' og så 'l') og oplysninger der kan "
 "reproducere problemet til <easytag at gmail.com>"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Ukendt signal"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2537,11 +2578,11 @@ msgstr ""
 "sti_til/filer     Indlæs relativ sti.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normal afslutning."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2549,84 +2590,84 @@ msgstr ""
 "Nogle filer er blevet ændret men ikke gemt...\n"
 "Vil du gemme dem før du afslutter programmet?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Vil du virkelig afslutte programmet? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 mærke"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis mærke"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis mærke"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE mærke"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC mærke"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 fil"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 fil"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis fil"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "Næste fil"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC fil"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack fil"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio fil"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC fil"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "MusePack fil"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Billeder"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2634,14 +2675,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2652,11 +2693,11 @@ msgstr ""
 "til systemets tegnsæt\n"
 "(Prøv at sætte miljø-variablen G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Filnavn oversættelse"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Filnavnet '%s' overskrider %d tegn og vil blive forkortet!\n"
@@ -2680,56 +2721,56 @@ msgstr "Encoder:"
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "FEJL ved åbning af fil: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FEJL: Kunne ikke skrive kommentarer til fil '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Skrev mærke på '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Fjernede mærke på '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fejl under fjernelse af ID3v1 mærke på '%s' (%d)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fejl under fjernelse af ID3v2 mærke på '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fejl under opdatering af ID3v2 mærke på '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2744,77 +2785,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fejl under opdatering af ID3v1 mærke på '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Opdaterede mærke på '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Ingen fejl rapporteret"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Ingen tilgængelige hukommelse"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Ingen data at fortolke"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Forkert formatteret data"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Ingen buffer at skrive til"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Buffer er for lille"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Ugyldigt frame ID"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Anmodet felt ikke fundet"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Ukendt felt type"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Mærke er allerede tilknyttet til en fil"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Ugyldig mærke version"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Ingen fil at fortolke"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Prøver at skrive til en fil med kun læseadgang"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Fejl i pakning/udpakning"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Ukendt fejlbesked!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2823,7 +2864,7 @@ msgstr ""
 "Eftersom den følgende ødelagte fil: '%s'\n"
 "vil skabe en fejl i id3lib, vil den ikke blive indlæst af programmet."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Ødelagt fil..."
 
@@ -2831,75 +2872,75 @@ msgstr "Ødelagt fil..."
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Vælg fil..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Vælg mappe..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "Søger..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Kan ikke køre %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Opret en spilleliste"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3U spillelistenavn"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Brug mappenavn"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Redigér masker"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Spilleliste tilvalg"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Inkludér kun de valgte filer"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2907,31 +2948,31 @@ msgstr ""
 "Hvis aktiveret, vil kun de valgte filer blive skrevet til spillelisten. "
 "Ellers, vil alle filer blive skrevet."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Brug fuld sti for filer i spilleliste"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Brug relativ sti for filer i spilleliste"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Opret spilleliste i et niveau højere end dette"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Hvis aktiveret, vil spillelisten blive oprettet i mappen et niveau højere "
 "end dette."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Brug DOS-mappe adskiller"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2939,23 +2980,23 @@ msgstr ""
 "Denne indstilling erstatter UNIX-mappenavne adskiller '/' med DOS-adskiller "
 "'\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Spilleliste indhold"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Skriv kun liste af filer"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Skriv oplysninger ved hjælp af filnavn"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Skriv oplysninger med :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2964,12 +3005,12 @@ msgstr ""
 "Spileliste fil '%s' eksisterer allerede!\n"
 "Overskriv?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Skriv spilleliste..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2978,24 +3019,24 @@ msgstr ""
 "Kan ikke skrive spilleliste fil '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Skrev spilleliste fil '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Encoded af"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Søg efter en fil"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3003,93 +3044,93 @@ msgstr ""
 "alle filer blive vist."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "I :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "filnavnet"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "mærket"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Forskel på store og små bogstaver"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Fandt : %d fil(er)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Hent filnavne fra TXT fil"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Fil :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Indlæs "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Bekræft omdøbning af fil"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Indsæt et mellemrum før et stort bogstav"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Slet denne linje"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Slet alle blanke linje"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Inkludér kun de valgte filer"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Inkludér kun de valgte filer"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Genindlæs"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Skriv kun liste af filer"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Vælg alle linjer"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3097,20 +3138,20 @@ msgstr ""
 "Efter aktivering af denne indstilling, og efter at indlæse filnavne, den "
 "nuværende scanner vil blive kørt (scannervinduet skal være åbent)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Indsæt en blank linje"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Slet denne linje"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Flyt denne maske op"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Flyt denne maske ned"
@@ -3191,12 +3232,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FEJL: Kunne ikke åbne filen '%s' som vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Advarsel : Ogg Vorbis filen '%s' indeholder et ID3v2 mærke."
@@ -3790,15 +3831,15 @@ msgid ""
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
 "Med denne indstilling, vil der prøvæs at konverteres til tegnsættet "
-"associeret med dit locale (f.eks: ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-"
-"8859-2 for 'ro'). Hvis det fejler, vil den prøve tegnsættet ISO-8859-1."
+"associeret med dit locale (f.eks: ISO-8859-1 for 'fr', KOI8-R for 'ru', "
+"ISO-8859-2 for 'ro'). Hvis det fejler, vil den prøve tegnsættet ISO-8859-1."
 
 #: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Tving at brug systemtegnsættet og aktivér konvertering af ukendte tegn"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3813,7 +3854,7 @@ msgid ""
 "characters"
 msgstr "Tving til at bruge systemtegnsæt og smid nogle tegn væk"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3970,24 +4011,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Tegnsæt for ID3-mærker"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Skriv ID3v2 mærke"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Skriv ID3v2 mærke"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3997,12 +4049,12 @@ msgstr ""
 "begyndelsen af MP3-filer. Ellers vil det blive fjernet."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "Beskrivelse:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4011,37 +4063,37 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Encoded af"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Tegnsæt der skal bruges til at skrive mærke-data i filen."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr " Nej "
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4051,26 +4103,26 @@ msgstr ""
 "Med denne indstilling, når et tegn ikke kan repræsenteres i det valgte "
 "tegnsæt, vil der blive gættet på et andet tegn der ligner."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 mærke"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Skriv ID3v1.x mærke"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4078,30 +4130,30 @@ msgstr ""
 "Hvis aktiveret, vil et ID3v1 mærke blive tilføjet eller opdateret for enden "
 "af MP3-filer. Ellers vil det blive fjernet."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Tegnsæt der skal bruges til at skrive mærke-data i filen."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Tegnsæt for ID3-mærker"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4114,8 +4166,8 @@ msgstr ""
 "mærker).\n"
 "\n"
 "For eksempel :\n"
-"  - i tidligere versioner af EasyTAG, kunne du gemme UTF-8 strenge i et ISO-"
-"8859-1 felt. Dette er ikke korrekt! For at konvertere disse mærker til "
+"  - i tidligere versioner af EasyTAG, kunne du gemme UTF-8 strenge i et "
+"ISO-8859-1 felt. Dette er ikke korrekt! For at konvertere disse mærker til "
 "Unicode: aktivér denne indstilling og vælg UTF-8. Du skal også aktivere den "
 "ovenståænde indstilling 'Prøv at gem mærker til ISO-8859-1. Hvis det ikke er "
 "muligt så brug UNICODE (anbefalet)' eller 'Gem altid mærker i ISO-8859-1 "
@@ -4124,31 +4176,31 @@ msgstr ""
 "'Windows-1251' for at indlæse mærker skrevet under Windows. Og 'KOI8-R' til "
 "at indlæse mærker skrevet med Unix systemer."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Tegnsæt der skal bruges til at læse mærke-data i filen."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Udfyld mærke scanner - Karakter konvertering"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertér underscore karakter '_' og streng '%20' til mellemrum ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertér mellemrum ' ' til underscore '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4157,11 +4209,11 @@ msgstr ""
 "fra scanneren for mærker."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Omdøb filscanner - Karakter konvertering"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4170,18 +4222,18 @@ msgstr ""
 "i scanneren for filnavne."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Behandl felter scanner - Karakter konvertering"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Lav ikke stort bogstav i starten af ord for nogle præpositioner og artikler."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4192,15 +4244,15 @@ msgstr ""
 "f.eks. 'feat.' (featuring)."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Scannervindue"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Ã…bn scannervindue ved opstart"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4208,11 +4260,11 @@ msgstr ""
 "Aktiver denne indstilling for automatisk at åbne scannervinduet når EasyTAG "
 "starter."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Scannervindue altid øverst"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4221,16 +4273,16 @@ msgstr ""
 "hovedvinduet."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Felter"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Overskriv felter når der scannes efter mærker"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4238,11 +4290,11 @@ msgstr ""
 "Hvis aktiveret, vil scanneren erstatte eksisterened tekst i felter med ny "
 "tekst. Hvis deaktiveret, vil kun blanke felter af felter blive udfyldt."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Sæt denne tekst som standard kommentar :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4251,11 +4303,11 @@ msgstr ""
 "kommentar feltet når der bruges 'Udfyld mærke' scanneren."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "Brug CRC32 som standard kommentar (for filer med ID3 tags kun)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4266,46 +4318,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CDDB"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Automatisk søgning"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Navn :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI-sti :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Serverindstillinger"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CDDB"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "CGI-sti :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4314,58 +4366,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Mellemværtsindstillinger"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Brug en mellemvært"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivér mellemværtsindstillinger"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Værtsnavn :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Navn på mellemværtsserveren."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Port på mellemværtsserveren."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Brugernavn :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Navn på bruger for mellemværten."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Bruger adgangskode :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Brugerens adgangskoden til mellemværten."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Spornavn liste"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "Vælg tilsvarende lydfil (position eller DLM hvis aktiveret nedenunder)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4374,7 +4426,7 @@ msgstr ""
 "tilsvanrede lydfil i hovedlisten også blive valgt."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4385,15 +4437,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Bekræftelse"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Bekræft afslutning fra programmet"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4401,57 +4453,61 @@ msgstr ""
 "Hvis aktiveret, åbnes en dialogboks for at spørge om bekræftelse før "
 "afslutning af programmet."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Bekræft skrivning af filmærke"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Bekræft omdøbning af fil"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Bekræft sletning af fil"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Bekræft skrivning af spilleliste"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Anvend ændringer (men gem ikke) og luk dette vindue"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Luk dette vinduet uden at gemme"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Gem ændringer og luk dette vindue"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Eksempel : %.*d_-_Spor_navn_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Ændringer anvendt"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Opsætning gemt"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Opsætning uændret"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4462,57 +4518,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Ikke en mappe"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Lydafspilleren '%s' blev ikke fundet!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Udfyld mærke"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Omdøb fil og mappe"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Behandl felter"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Mærke succesfuldt scannet..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Mærke succesfuldt scannet...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Scan fejl: kan ikke finde adskiller '%s' i '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Kunne ikke konvertere filnavn '%s' til systemets tegnsæt for filnavne."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Nyt filnavn succesfuldt scannet..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nyt filnavn succesfuldt scannet...(%s)"
@@ -4520,41 +4576,41 @@ msgstr "Nyt filnavn succesfuldt scannet...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Mærk og filnavns scan"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Scanner :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Vælg scannertypen"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Ã…bn scannervindue / Scan valgte filer"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Scanner indstillinger"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Vis / Skjul maske redigering"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Vis / Skjul signatur"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4563,15 +4619,15 @@ msgstr ""
 "filnavne og sti. Brugt til at udfylde i mærke-felter."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Udfyld-mærke forvisning..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Præfiks maske med nuværende sti"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4584,15 +4640,15 @@ msgstr ""
 "sti, ellers er den relativ til den gamle sti."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Omdøb filforvisning..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Vælg felter:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4601,126 +4657,136 @@ msgstr ""
 "dem som har din interesse."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Behandl filnavnsfelt"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Behandl titel felt"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "K"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Behandl kunstnerfelt"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Behandl kunstnerfelt"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "A"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Behandl album felt"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Behandl genre felt"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Ko"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Behandl kommentar felt"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Op"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Behandl komponist felt"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Behandl original kunstner felt"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Oh"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Behandl ophavsret felt"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Behandl URL felt"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Behandl encoder-navn felt"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Invertér valg"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Vælg/fravælg alle."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertér '_' og '%20' til ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Konvertér :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "til : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4728,7 +4794,7 @@ msgstr ""
 "Underscore-karakteren eller strengen '%20' er erstattet af et mellemrum. F."
 "eks., før: 'Text%20In%20An_Entry', efter: 'Text In An Entry'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4736,16 +4802,16 @@ msgstr ""
 "Mellemrumskarakteren er erstattet af en underscore-karakter. F.eks.:, før: "
 "'Text In An Entry', efter: 'Text_In_An_Entry'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4753,7 +4819,7 @@ msgstr ""
 "Konvertér alle ord i alle felter til store bogstaver. F.eks., før: 'Text IN "
 "AN entry', efter: 'TEXT IN AN ENTRY'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4761,7 +4827,7 @@ msgstr ""
 "Konvertér alle ord i felter til små bogstaver. F.eks., før: 'TEXT IN an "
 "entry', efter: 'text in an entry'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4769,7 +4835,7 @@ msgstr ""
 "Konvertér det første bogstav i hvert felt til stort. F.eks., før: 'text IN "
 "An ENTRY', efter: 'Text in an entry'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4777,7 +4843,7 @@ msgstr ""
 "Konvertér det første bogstav for hvert ord i hvert felt til stort. F.eks., "
 "før: 'Text in an ENTRY', efter: 'Text In An Entry'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4786,15 +4852,15 @@ msgstr ""
 "Et mellemrum er indsat før hvert store bogstav. F.eks., før: "
 "'TextInAnEntry', efter: 'Text In An Entry'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Indsæt et mellemrum før et stort bogstav"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Fjern dubletter af mellemrum og underscores"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4802,7 +4868,7 @@ msgstr ""
 "Alle mellemrum mellem ord er fjernet. F.eks., før: 'Text In An Entry', "
 "efter: 'TextInAnEntry'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4810,7 +4876,7 @@ msgstr ""
 "Et mellemrum er indsat før hvert store bogstav. F.eks., før: "
 "'TextInAnEntry', efter: 'Text In An Entry'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4821,161 +4887,166 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Signatur"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : kunstner"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : kunstner"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : kommentar"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : komponist"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : ophavsret"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : disknummer"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : encoded af"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignoreret"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : antal spor"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : orig. kunstner"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : spor"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : år"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Maske redigering"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Opret ny maske"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Flyt denne maske op"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Flyt denne maske ned"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Dublér maske"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Tilføj standard maskem"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Fjern maske"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Gem masker"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Ny_maske"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Kopi: Ingen række valgt!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Fjern: Ingen række valgt!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Flyt op: Ingen række valgt!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Flyt ned: Ingen række valgt!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "FEJL: Kan ikke skrive opsætningsfil: %s (%s)\n"
 "\a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan ikke åbne opsætningsfil '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Henter standardopsætning..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan ikke oprette eller åbne fil '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4983,28 +5054,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Indlæser standard 'Udfyld mærke' masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Indlæser standard 'Omdøb fil' masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Indlæser standard 'Omdøb mappe' masker..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "FEJL: Miljøvariablen HOME er ikke sat!\n"
 "\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEJL: Kan ikke oprette mappe '%s' (%s)!"
diff --git a/po/de.gmo b/po/de.gmo
index 597fd76..79f3426 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 11ea44e..11b4001 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,12 +10,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: EasyTAG 2.1.5\n"
+"Project-Id-Version: EasyTAG 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
-"PO-Revision-Date: 2008-01-27 18:47+0000\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
+"PO-Revision-Date: 2008-07-14 21:51+0200\n"
 "Last-Translator: Götz Waschk <goetz.waschk at gmail.com>\n"
 "Language-Team: German <de at li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,6 +33,7 @@ msgstr ""
 "einfacher."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Deutsche Ãœbersetzung)"
 
@@ -111,137 +113,137 @@ msgstr "(Hebräische Übersetzung)"
 msgid "(Serbian translation)"
 msgstr "(Serbische Ãœbersetzung)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "Erweiterungsname"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "Status"
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Kommentar"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Ãœber..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Ãœber"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compiliert: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(verwendet: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-Mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Homepage: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Beschreibung:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "MP3-Unterstützung"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "aktiviert"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "Schreiben von ID3v2.3-Tags"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "verfügbar"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Ogg Vorbis-Unterstützung"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Speex-Unterstützung"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "FLAC-Unterstützung"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "MP4/AAC-Unterstützung"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "WavPack-Unterstützung"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Danksagung"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Ãœbersetzungen:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Allgemeines:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Änderungen"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Datei '%s' kann nicht geöffnet werden (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "FEHLER beim Öffnen der Datei: '%s' (%s)."
@@ -249,484 +251,490 @@ msgstr "FEHLER beim Öffnen der Datei: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Datei"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Liste nach Tag sortieren"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Liste nach Eigenschaft sortieren"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Aufsteigend nach Datei-Namen "
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Absteigend nach Datei-Namen"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Aufsteigend nach Erstellungsdatum"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Absteigend nach Erstellungsdatum"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Aufsteigend nach Titelnummer"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Absteigend nach Titelnummer"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Aufsteigend nach Titel"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Absteigend nach Titel"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Aufsteigend nach Künstler"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Absteigend nach Künstler"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Aufsteigend nach Künstler"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Absteigend nach Künstler"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Aufsteigend nach Album"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Absteigend nach Album"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Aufsteigend nach Jahr"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Absteigend nach Jahr"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Aufsteigend nach Genre"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Absteigend nach Genre"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Aufsteigend nach Kommentar"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Absteigend nach Kommentar"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Aufsteigend nach Komponisten"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Absteigend nach Komponisten"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Aufsteigend nach Originalkünstler"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Absteigend nach Originalkünstler"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Aufsteigend nach Copyright"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Absteigend nach Copyright"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Aufsteigend nach URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Absteigend nach URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Aufsteigend nach Kodierer"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Absteigend nach Kodierer"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Aufsteigendn nach Dateityp"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Absteigend nach Dateityp"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Aufsteigend nach Dateigröße"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Absteigend nach Dateigröße"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Aufsteigend nach Länge"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Absteigend nach Länge"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Aufsteigend nach Bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Absteigend nach Bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Aufsteigend nach Samplerate"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Absteigend nach Samplerate"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Öffne Datei(en) mit ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Alle Dateien auswählen"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Alle Dateien abwählen"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Dateiauswahl umkehren"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Datei(en) löschen..."
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Erste Datei"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Erste Datei"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "_Vorherige Datei"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Vorherige Datei"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Nächste Datei"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Nächste Datei"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "Let_zte Datei"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Letzte Datei"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "Datei(en) _scannen"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Datei(en) scannen"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "Tag(s) ent_fernen"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Tag(s) entfernen"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "Letzte Änderungen rückgängig _machen"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Letzte Änderungen rückgängig machen"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Wiederholen der letzten Änderungen"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Wiederholen der letzten Änderungen"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Speichere Datei(en)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Speichere Datei(en)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "Er_zwinge Speichern der Datei(en)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Erzwinge Speichern der Datei(en)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Mache letzte Änderungen rückgängig"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Wiederhole letzte Änderungen"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Auswahl"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Zum _persönlichen Ordner gehen"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Zum persönlichen Ordner gehen"
 
-#: src/bar.c:211
-#, fuzzy
+#: src/bar.c:215
 msgid "Go to Desktop Directory"
-msgstr "Zum Vorgabeverzeichnis gehen"
+msgstr "Zum Desktopverzeichnis gehen"
 
-#: src/bar.c:212
-#, fuzzy
+#: src/bar.c:216
 msgid "Go to Documents Directory"
-msgstr "Zum persönlichen Ordner gehen"
+msgstr "Zum Dokumentenverzeichnis gehen"
 
-#: src/bar.c:213
-#, fuzzy
+#: src/bar.c:217
 msgid "Go to Downloads Directory"
-msgstr "Zum persönlichen Ordner gehen"
+msgstr "Zum Downloads-Ordner gehen"
 
-#: src/bar.c:214
-#, fuzzy
+#: src/bar.c:218
 msgid "Go to Music Directory"
-msgstr "Zum persönlichen Ordner gehen"
+msgstr "Zum Musikordner gehen"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Zum _Vorgabeverzeichnis gehen"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Zum Vorgabeverzeichnis gehen"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "_Aktuellen Pfad als Vorgabe setzen"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Aktuellen Pfad als Vorgabe setzen"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Baumansicht | Künstler-Album-Ansicht"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Verzeichnis umbenennen..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Verzeichnis neu einlesen"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Verzeichnis betrachten mit ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Verzeichnisbaum schließen"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "Verzeichnisbaum _aktualisieren"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "S_canner"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Fülle Tag(s)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Fülle Tag(s)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "Dateien und Verzeichnis _umbenennen ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Dateien und Verzeichnis umbenennen ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "Felder _verarbeiten ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Felder verarbeiten ..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Extra"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Suche _Datei(en)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Suche Datei(en)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "CD-Daten_banksuche ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB-Suche ..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Lade Dateinamen aus Textdatei..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Schreibe Wiedergabeliste..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Audio-Player starten"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Einstellungen"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Einstellungen..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Einstellungen..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Ãœber"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Aktuellen Befehl abbrechen"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Dateioptionen"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "CDDB-Dateisuche..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Lösche Logbuch"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "_Unterverzeichnisse durchsuchen"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Zeige versteckte Verzeichnisse"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Zeige Baumansicht / Ansicht nach Künstler und Album"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Konnte Oberfläche nicht verschmelzen, der Fehler war: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Bereit zum Start..."
 
@@ -735,7 +743,7 @@ msgid "New default path for files selected"
 msgstr "Neuer Vorgabepfad für Dateien ausgewählt"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Bestätigen..."
 
@@ -747,123 +755,127 @@ msgstr ""
 "Einige Dateien wurden verändert, aber nicht gespeichert...\n"
 "Möchten sie diese vor dem Wechseln des Verzeichnisses speichern?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Alle Alben>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 "Fehler: Bei der Suche nach %s konnte der Knoten %s nicht im Baum gefunden "
 "werden."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Baum"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Dateiname"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Titel"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Künstler"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Jahr"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Stück #"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Genre"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Originalkünstler"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 msgid "Encoded By"
 msgstr "Kodiert von"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Alben"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Dateien"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Zum Elternverzeichnis gehen"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Geben sie das zu durchsuchende Verzeichnis an"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 msgid "Select a directory to browse."
 msgstr "Wählen sie ein Verzeichnis aus!"
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
-#, fuzzy
+#: src/browser.c:3095
 msgid "... file(s)"
-msgstr "%u Datei(en)"
+msgstr "... Datei(en)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Künstler & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Verzeichnis umbenennen"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Benenne Verzeichnis '%s' um in : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Nutze Maske :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "Wenn aktiviert, dann werden Masken zur Umbenennung des Verzeichnisses "
 "verwendet."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -871,31 +883,31 @@ msgstr ""
 "Wählen sie eine Maske aus oder Tippen sie Codes ein (siehe Legende im "
 "Scanner), um das Verzeichnis aus Tagfeldern umzubenennen."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Ungültige Scannermaske"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Verzeichnisumbenennungsvorschau..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Fehler..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Sie müssen einen Verzeichnisnamen angeben!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -930,7 +942,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -939,7 +951,7 @@ msgstr ""
 "Umbenennung nicht möglich, da dieser Verzeichnisname bereits existiert!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -954,88 +966,88 @@ msgstr ""
 "'%s' umbenannt werden!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Verzeichnis umbenannt"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Programm starten:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Gib den Namen des Programms an, das gestartet werden soll. Es wird das "
 "aktuelle Verzeichnis als Parameter verwendet."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Öffne Datei mit ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Gib den Namen des Programms an, das gestartet werden soll. Es wird die "
 "aktuelle Datei als Parameter verwendet."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Sie müssen einen Programmnamen angeben!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Das Programm '%s' wurde nicht gefunden!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kann %s nicht ausführen (Fehler %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Kein weiterer Prozess kann gestartet werden!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Ausgeführtes Programm: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Künstler / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Kategorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Stückname:"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Zeit"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "CD-Datenbanksuche"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatische Suche"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "Frage CD-Datenbank an :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1043,16 +1055,16 @@ msgstr ""
 "Frage die CDDB-Datenbank automatisch mit den ausgewählten Dateien (die "
 "Reihenfolge ist wichtig!) an, um die CddbID zu erzeugen."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Suche abbrechen ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Benutze lokale CDDB"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1063,139 +1075,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Manuelle Suche"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Wörter :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Gib die zu suchenden Wörter ein (durch Leerzeichen oder '+' getrennt)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Suche in :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Alle Felder"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Andere"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Alle Kategorien"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klassik"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Extra"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "New Age"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "beinhaltet: Funk, Soul, Rap, Pop, Industrial, Metal, usw."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "Filme, Shows"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "andere, die nicht in die obigen Kategorien passen"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Kategorien"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Ergebnisse :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Suche :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Gib die in der unten stehenden Liste zu  suchenden Wörter ein"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Suche nächsten"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Suche vorherigen"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Zeige nur rote Zeilen (oder zeige alle Zeilen) in der 'Künster / Album'-"
 "Liste "
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Alle Zeilen abwählen"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Zeilenauswahl umkehren"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Alle Zeilen auswählen"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1208,36 +1220,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Setze ein :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Alle"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Stück #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Stücke"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Aktuellen Scanner für alle Dateien ausführen"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Finde passende Zeilen mit dem Levenshtein-Algorithmus"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1251,91 +1263,95 @@ msgstr ""
 "Dies wird bei der Auswahl der zugehörigen Audiodatei oder der Anwendung der "
 "CDDB-Ergebnisse statt der Benutzung der direkten Reihenfolge durchgeführt."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Lade die ausgewählten oder alle Zeilen (wenn keine ausgewählt sind)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Bereit zur Suche..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Album: '%s', Künstler: '%s', Länge: '%s', Jahr: '%s', Genre: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Sortiere nach Stücknummer"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Sortiere nach Stücknamen"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Suche Rechner '%s' ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kann Rechner '%s' nicht finden (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Kann keinen neuen Socket öffnen (%s)! "
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Verbinde mit Rechner '%s' Port '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kann keine Verbindung zu '%s' aufbauen (%s)! "
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Verbunden mit Rechner '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Empfange Daten (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fehler beim Lesen der CDDB-Anfrage (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Datei '%s' kann nicht angelegt werden (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "FEHLER: Datei '%s' kann nicht geöffnet werden (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Sende Anfrage ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kann die Anfrage nicht senden (%s)!"
@@ -1344,62 +1360,63 @@ msgstr "Kann die Anfrage nicht senden (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Empfange Daten ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Der Server hat eine falsche Antwort gegeben!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Der Server hat eine falsche Antwort gegeben! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Entschuldigung, die Web-basierte Suche funktioniert gerade nicht."
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d passende Alben gefunden."
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Empfange Daten der Seite %d (Album %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Empfange Daten der Seite %d ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Mehr Ergebnisse zu laden ..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Keine Datei ausgewählt!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Mehr als 99 Dateien ausgewählt! Kann die Anfrage nicht stellen!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d Datei(en) ausgewählt!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Lokale CD-Suche..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
@@ -1407,28 +1424,28 @@ msgstr ""
 "Der Pfad zur 'lokalen CD-Datenbank' wurde nicht festgelegt!\n"
 "Stellen sie ihn vor dieser Suche im Einstellungsfenster ein."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Sende Anfrage (CddbId: %s, #Stücke: %d, CD-Länge: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d passende Alben für die DiscID '%s' gefunden."
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Datei '%s' kann nicht geöffnet werden (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Lade Titelliste des Albums ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1441,7 +1458,7 @@ msgstr ""
 "\n"
 "Wollen sie weitermachen?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Schreibe Tag aus CDDB..."
 
@@ -1701,7 +1718,7 @@ msgstr "Unbekannter Parameter oder Pfad '%s'\n"
 msgid "Browser"
 msgstr "Auswahl"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Datei"
 
@@ -1715,11 +1732,11 @@ msgstr "Datei-Link kaputt"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Ebene ?"
 
@@ -1727,7 +1744,7 @@ msgstr "?, Ebene ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1735,17 +1752,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frequenz:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modus:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1762,7 +1779,7 @@ msgid "Time:"
 msgstr "Dauer:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Tag"
 
@@ -1791,34 +1808,45 @@ msgstr "Künstler:"
 msgid "Tag selected files with this artist"
 msgstr "Diesen Künstler in allen ausgewählten Dateien eintragen"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Künstler:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Diesen Künstler in allen ausgewählten Dateien eintragen"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Diesen Albumnamen in allen ausgewählten Dateien eintragen"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Diesen CD-Nummer in allen ausgewählten Dateien eintragen"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Jahr:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Dieses Jahr in allen ausgewählten Dateien eintragen"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Alle ausgewählten Stücke sequentiell durchnummerieren. Beginnt mit 01 in "
@@ -1826,11 +1854,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Stück #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1838,289 +1866,300 @@ msgstr ""
 "Fügt die Anzahl der Dateien, die in dem gleichen Verzeichnis wie die "
 "aktuelle Datei sind, den ausgewählten Dateien hinzu."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Diese Gesamtzahl an Stücken in allen ausgewählten Dateien eintragen"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Dieses Genre in allen ausgewählten Dateien eintragen"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Diesen Kommentar in allen ausgewählten Dateien eintragen"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Komponist"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Diesen Komponisten in allen ausgewählten Dateien eintragen"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Originalkünstler:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Diesen Originalkünstler in allen ausgewählten Dateien eintragen"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Dieses Copyright in allen ausgewählten Dateien eintragen"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Diese URL in allen ausgewählten Dateien eintragen"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Kodierer:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Diesen Kodierer in allen ausgewählten Dateien eintragen"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Bilder"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Bilder:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Sie können Bilder durch Drag und Drop hinzufügen."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Diese Bilder in allen ausgewählten Dateien eintragen"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Fügt Bilder zu diesem Tag hinzu (Drag und Drop ist auch verfügbar)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Entferne ausgewählter Bilder, sonst alle Bilder."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Speichere ausgewählte Bilder auf der Festplatte."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Setze Eigenschaftern der ausgewählten Bilder."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "In allen ausgewählten Dateien wurde der Title '%s' eintragen."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Dieser Titel wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Künstler '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Künstler wurde(n) aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Künstler '%s' wurde in allen ausgewählten Dateien eingetragen."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Künstler wurde(n) aus allen ausgewählten Dateien entfernt."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Album '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Albumname wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "CD-Nummer '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "CD-Nummer aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Jahr '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Jahr wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "In allen ausgewählten hDateien wurden Stücknummern wie 'xx/%s' eingetragen."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 "In allen ausgewählten Dateien wurden Stücknummern wie 'xx' eingetragen."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Stücknummer aus allen ausgewählten Dateien entfernt."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Alle ausgewählten Stücke wurden durchnummeriert."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Genre '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Genre wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Kommentar '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Kommentar wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Komponist '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Komponist wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Originalkünstler '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Originalkünstler wurde(n) aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Copyright '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Copyright wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "URL '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "URL wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Kodierer '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Kodierer wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "In allen ausgewählten Dateien wurden die Bilder eingetragen."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Die Bilder wurden aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Wählen sie Modus und Maske und wiederholen sie die Aktion"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Alle Tags wurden durchsucht"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Alle Tags wurden entfernt"
 
-#: src/easytag.c:2200
-#, c-format
+#: src/easytag.c:2240
+#, fuzzy, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
+"Seien sie vorsichtig, mehrere Dateien (%d Datei(en)) wurden von einem "
+"externen Programm verändert.\n"
+"Wollen sie trotzdem fortfahren?"
 
-#: src/easytag.c:2202
-#, fuzzy
+#: src/easytag.c:2242
 msgid "Saving File(s)..."
-msgstr "Suche Datei(en)..."
+msgstr "Speichere Datei(en)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
-msgstr ""
+msgstr "Speichern der Dateien wurde gestoppt..."
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Alle Dateien wurden gespeichert..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Dateien wurden teilweise gelöscht..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Alle Dateien wurden gelöscht..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2129,16 +2168,16 @@ msgstr ""
 "Wollen sie den Tag der Datei\n"
 "'%s' schreiben?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Tag wird geschrieben..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Datei und Verzeichnis umbenennen..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2152,11 +2191,11 @@ msgstr ""
 "'%s' umbenennen?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Verzeichnis umbenennen..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2170,11 +2209,11 @@ msgstr ""
 "'%s' umbenennen?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Datei umbenennen..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2187,40 +2226,36 @@ msgstr ""
 "in \n"
 "'%s' umbenennen?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Schreibe Tag von '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Tag(s) wurden geschrieben"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
 "(%s)"
-msgstr ""
-"Tag kann nicht in Datei '%s' geschrieben werden!\n"
-"(%s)"
+msgstr "Tag kann nicht in Datei '%s' geschrieben werden! (%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
-#, fuzzy, c-format
+#: src/easytag.c:2806 src/easytag.c:2813
+#, c-format
 msgid "Can't write tag in file '%s'! (%s)"
-msgstr ""
-"Tag kann nicht in Datei '%s' geschrieben werden!\n"
-"(%s)"
+msgstr "Tag kann nicht in Datei '%s' geschrieben werden! (%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Benenne Datei '%s' um"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2233,20 +2268,16 @@ msgstr ""
 "'%s' umbenannt werden!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
-#, fuzzy, c-format
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
+#, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
-msgstr ""
-"Datei '%s'\n"
-" kann nicht in \n"
-"'%s' umbenannt werden!\n"
-"(%s)"
+msgstr "Datei '%s' kann nicht in '%s' umbenannt werden! (%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Datei(en) nicht umbenannt..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2259,16 +2290,14 @@ msgstr ""
 "kann nicht umbenannt werden, da die folgende Datei bereits existiert:\n"
 "'%s'"
 
-#: src/easytag.c:3014
-#, fuzzy, c-format
+#: src/easytag.c:3054
+#, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
-"Datei \n"
-"'%s'\n"
-"kann nicht umbenannt werden, da die folgende Datei bereits existiert:\n"
-"'%s'"
+"Datei '%s' kann nicht umbenannt werden, da die folgende Datei bereits "
+"existiert: '%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2279,25 +2308,22 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
-#, fuzzy, c-format
+#: src/easytag.c:3099
+#, c-format
 msgid "Can't create target directory '%s'! (%s)"
-msgstr ""
-"Kann das Zielverzeichnis nicht anlegen\n"
-"'%s'!\n"
-"(%s)"
+msgstr "Kann das Zielverzeichnis '%s' nicht anlegen ! (%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Datei '%s' wurde in '%s' umbenannt"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Datei(en) umbenannt..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2308,26 +2334,23 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
-#, fuzzy, c-format
+#: src/easytag.c:3151 src/easytag.c:3212
+#, c-format
 msgid "Can't remove old directory '%s'! (%s)"
-msgstr ""
-"Kann das alte Verzeichnis nicht entfernen\n"
-"'%s'!\n"
-"(%s)"
+msgstr "Kann das alte Verzeichnis '%s' nicht entfernen! (%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Datei '%s' nach '%s' verschoben"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Datei(en) verschoben..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2340,20 +2363,16 @@ msgstr ""
 "'%s' verschoben werden!\n"
 "(%s)"
 
-#: src/easytag.c:3208
-#, fuzzy, c-format
+#: src/easytag.c:3248
+#, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
-msgstr ""
-"Datei '%s'\n"
-" kann nicht nach \n"
-"'%s' verschoben werden!\n"
-"(%s)"
+msgstr "Datei '%s' kann nicht nach '%s' verschoben werden! (%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Datei(en) nicht verschoben..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2362,16 +2381,16 @@ msgstr ""
 "Wollen sie diese Datei wirklich löschen:\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Datei löschen..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Datei '%s' gelöscht"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2383,109 +2402,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Suche läuft..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Datei: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "%d Datei(en) in diesem Verzeichnis und Unterverzeichnissen gefunden"
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "%d Datei(en) in diesem Verzeichnis gefunden"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u Datei(en)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Keine Datei in diesem Verzeichnis oder Unterverzeichnissen gefunden!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Keine Datei in diesem Verzeichnis gefunden!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Suche..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "Suche ABBRECHEN...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Wählen sie ein Verzeichnis aus!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Dieses Feld in allen ausgewählten Dateien eintragen"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "'_' und '%20' in Leerzeichen umwandeln"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "' ' in '_' umwandeln"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Alles groß schreiben"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Alles klein schreiben"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Ersten Buchstaben groß schreiben"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Der erste Buchstabe jeden Wortes wird groß geschrieben"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Leerzeichen entfernen"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Vor Großbuchstaben ein Leerzeichen einfügen"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Doppelte Leerzeichen oder Unterstriche entfernen"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Fehlerhaft beendet! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Signal %s (%d) empfangen \a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2495,11 +2513,11 @@ msgstr ""
 "Fehlerbericht mit einem GDB-Backtrace ('gdb easytag core', dann 'bt' und "
 "'l') an <easytag at gmail.com>"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Unbekanntes Signal"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2533,11 +2551,11 @@ msgstr ""
 "Pfad_zu/Dateien         verwende relativen Pfad.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normal beendet."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2545,82 +2563,82 @@ msgstr ""
 "Einige Dateien wurden verändert, aber nicht gespeichert...\n"
 "Möchten sie diese vor Beendigung des Programms speichern?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Wollen sie das Programm wirklich beenden? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
-msgstr ""
+msgstr "Automatische Korrekturen wurden für die Datei '%s' angewendet."
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3-Tag"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis Tag"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis Tag"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE-Tag"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC-Tag"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack-Tag"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3-Datei"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2-Datei"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis-Datei"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex-Datei"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC-Datei"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack-Datei"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's-Audio-Datei"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC-Datei"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack-Datei"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Bilder (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2628,14 +2646,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2646,11 +2664,11 @@ msgstr ""
 "Dateinamenskodierung des Systems konvertiert werden.\n"
 "(Versuchen sie, die Umgebungsvariable G_FILENAME_ENCODING zu setzen)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Dateinamensübersetzung"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Der Dateiname '%s' überschreitet %d Zeichen und wird abgeschnitten!\n"
@@ -2674,54 +2692,56 @@ msgstr "Encoder:"
 msgid "Channels:"
 msgstr "Kanäle:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "FEHLER beim Öffnen der Datei: '%s' als FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
+"Der Jahreswert '%s' scheint für die Datei '%s' ungültig zu sein. Diese "
+"Information wird beim Speichern des Tags verloren gehen."
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr "Bildblock ist ungültig: '%s'"
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FEHLER: Kann Kommentare nicht in Datei schreiben: '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Tag von '%s' wurde geschrieben"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Tag von '%s' wurde entfernt"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fehler beim Entfernen des IDv1-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fehler beim Entfernen des IDv2-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fehler beim Aktualisieren des ID3v2-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2746,77 +2766,77 @@ msgstr ""
 "\n"
 "Datei : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fehler beim Aktualisieren des ID3v1-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Tag von '%s' wurde aktualisiert"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Kein Fehler gemeldet"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Kein Speicher verfügbar"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Keine Daten zu analysieren"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Ungeeignet formatierte Daten"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Kein Schreibpuffer vorhanden"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Puffer zu klein"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Ungültige Frame-ID"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Angefordertes Feld nicht gefunden"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Unbekannter Feldtyp"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Tag hängt bereits an einer Datei"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Ungültige Tag-Version"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Keine Datei zu analysieren"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Versuch, in eine nur lesbare Datei zu schreiben"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Fehler beim Komprimieren/Dekomprimieren"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Unbekannte Fehlermeldung!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2825,7 +2845,7 @@ msgstr ""
 "Da die beschädigte Datei '%s' einen Fehler mit id3lib auslöst,\n"
 "wird sie vom Programm nicht bearbeitet."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Beschädigte Datei..."
 
@@ -2833,74 +2853,74 @@ msgstr "Beschädigte Datei..."
 msgid "Log"
 msgstr "Logbuch"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Datei auswählen..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Wähle Verzeichnis..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Warnung..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Kein Musikprogramm vorgegeben!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Kann %s nicht ausführen (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Erzeuge eine Wiedergabeliste"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3U-Wiedergabelistenname"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Nutze Verzeichnisnamen"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Bearbeite Masken"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Wiedergabelisten-Optionen"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Nur ausgewählte Dateien einfügen"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2908,31 +2928,31 @@ msgstr ""
 "Wenn aktiviert, dann werden nur die ausgewählten Dateien in die "
 "Wiedergabeliste geschrieben, ansonsten werden alle Dateien verwendet."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Benutze vollen Pfad für Dateien in der Wiedergabeliste"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Benutze relativen Pfad für Dateien in der Wiedergabeliste"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Erzeuge Wiedergabeliste im Elternverzeichnis"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Wenn aktiviert, dann wird die Wiedergabelistendatei im Elternverzeichnis "
 "erzeugt."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Nutze DOS-Verzeichnistrennsymbol"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2940,23 +2960,23 @@ msgstr ""
 "Diese Option ersetzt das UNIX-Verzeichnistrennzeichen '/' durch das DOS-"
 "Zeichen '\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Inhalt der Wiedergabeliste"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Nur Liste der Dateien schreiben."
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Verwende Dateinamen beim Schreiben der Informationen"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Schreibe Information mit :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2965,12 +2985,12 @@ msgstr ""
 "Wiedergabelistendatei '%s' existiert bereits!\n"
 "Ãœberschreiben?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Schreibe Wiedergabeliste..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2979,24 +2999,24 @@ msgstr ""
 "Kann Wiedergabelistendatei '%s' nicht schreiben!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Wiedergabelistendatei '%s' wurde geschrieben."
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Kodierer"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Suche eine Datei"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3004,86 +3024,86 @@ msgstr ""
 "zur Anzeige aller Dateien."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "In :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "der Dateiname"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "das Tag"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Groß/Kleinschreibung beachten"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Gefunden : %d Datei(en)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Lade die Dateinamen aus einer Textdatei"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Datei :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr "Laden "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "Inhalt der Textdatei"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "Vor der ausgewählten Zeile eine Leerzeile einfügen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "Ausgewählte Zeile löschen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Lösche alle Leerzeilen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "Bewege ausgewählte Zeile nach oben"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "Bewege ausgewählte Zeile nach unten"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Neu Laden"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "Liste der Dateien"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "Ausgewählte Zeile:"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3091,19 +3111,19 @@ msgstr ""
 "Wenn diese Option aktiviert wird, dann wird der ausgewählte Scanner nach dem "
 "Laden der Dateinamen gestartet (das Scannerfenster muss offen sein)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Füge eine Leerzeile ein"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Diese Zeile löschen"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "Bewege diese Zeile nach oben"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "Bewege diese Zeile nach unten"
 
@@ -3187,12 +3207,12 @@ msgstr ""
 "Ogg Vorbis: Interner Logikfehler, das deutet auf einen Fehler oder einen "
 "defekten Heap/Stack hin (Datei: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FEHLER beim Öffnen der Datei: '%s' als Vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Warnung: Die Ogg-Datei '%s' enthält ein ID3v2-Tag."
@@ -3370,9 +3390,9 @@ msgid "Error with 'loader_write': %s"
 msgstr "Fehler bei 'loader_write': %s"
 
 #: src/picture.c:1117 src/picture.c:1150 src/picture.c:1169
-#, fuzzy, c-format
+#, c-format
 msgid "Picture file not loaded (%s)..."
-msgstr "Bilddatei nicht geladen..."
+msgstr "Bilddatei nicht geladen (%s)..."
 
 #: src/picture.c:1136
 #, c-format
@@ -3386,14 +3406,13 @@ msgstr ""
 "(%s)"
 
 #: src/picture.c:1181
-#, fuzzy
 msgid "Picture file loaded..."
-msgstr "Bilddatei nicht geladen..."
+msgstr "Bilddatei geladen..."
 
 #: src/picture.c:1197 src/picture.c:1204
-#, fuzzy, c-format
+#, c-format
 msgid "Picture file can't be saved (%s)..."
-msgstr "Bilddatei nicht geladen..."
+msgstr "Bilddatei kann nicht gespeichert werden (%s)..."
 
 #. Title
 #: src/prefs.c:118
@@ -3696,8 +3715,8 @@ msgid ""
 "problem when renaming the file. This is usefull when renaming the file from "
 "the tag with the scanner."
 msgstr ""
-"Konvertiere illegale Zeichen des Dateinamens für FAT32/16- und ISO9660"
-"+Joliet-Dateisysteme ('\\', ':', '*', '?', '\"', '<', '>', '|'),  um "
+"Konvertiere illegale Zeichen des Dateinamens für FAT32/16- und "
+"ISO9660+Joliet-Dateisysteme ('\\', ':', '*', '?', '\"', '<', '>', '|'),  um "
 "Probleme beim Umbenennen der Datei zu verhindern. Das ist sinnvoll beim "
 "Umbenennen der Datei über die Tags mit dem Scanner."
 
@@ -3789,8 +3808,8 @@ msgid ""
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
 "Mit dieser Einstellung wird die Umwandlung in die zu Ihrer Spracheinstellung "
-"gehörende Kodierung versucht (z.B. ISO-8859-1 für 'fr', KOI8-R für 'ru', ISO-"
-"8859-2 für 'ro'). Wenn das fehlschlägt, wird die Kodierung ISO-8859-1 "
+"gehörende Kodierung versucht (z.B. ISO-8859-1 für 'fr', KOI8-R für 'ru', "
+"ISO-8859-2 für 'ro'). Wenn das fehlschlägt, wird die Kodierung ISO-8859-1 "
 "versucht."
 
 #: src/prefs.c:551
@@ -3798,7 +3817,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Erzwinge die Systemzeichenkodierung und aktiviere die Transliteration"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3814,7 +3833,7 @@ msgid ""
 msgstr ""
 "Erzwinge die Systemzeichenkodierung und lasse einige Zeichen einfach weg"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3975,22 +3994,33 @@ msgstr "Verwende Komprimierung"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Verwende Komprimierung in den ID3v2-Tags"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Zeichensatz für das Schreiben von ID3-Tags"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2-Tags"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "ID3v2-Tag schreiben"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3999,11 +4029,11 @@ msgstr ""
 "hinzugefügt oder aktualisiert. Anderenfalls wird der Tag entfernt."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Version:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4015,34 +4045,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Zeichensatz:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Unicode-Typ"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Zeichensatz um Tag-Daten in die Datei zu schreiben."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Weitere Einstellungen für iconv():"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Keine"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
@@ -4052,25 +4082,25 @@ msgstr ""
 "existiert, unverändert. Es wird aber eine Fehlermeldung zur Information "
 "ausgegeben."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1-Tag"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "ID3v1.x-Tag schreiben"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4078,28 +4108,28 @@ msgstr ""
 "Ist dies aktiviert, wird ein ID3v1-Tag am Ende von MP3-Dateien hinzugefügt "
 "oder aktualisiert. Anderenfalls wird der Tag entfernt."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Zeichensatz um ID3v1-Tag-Daten in die Datei zu schreiben."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Zeichensatz zum Lesen von ID3-Tags"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Nicht-Standard:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4122,31 +4152,31 @@ msgstr ""
 "'Windows-1251' wählen, wenn die Tags unter Windows geschrieben wurden oder "
 "'KOI8-R' für Tags, die unter Unix geschrieben wurden."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Zeichensatz um Tag-Daten aus der Datei zu lesen."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Scanner zum Füllen der Tags - Zeichensatzkonvertierung"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Unterstrich '_' und '%20' durch ein Leerzeichen ' ' ersetzen"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Leerzeichen ' ' durch Unterstrich '_' ersetzen"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4155,11 +4185,11 @@ msgstr ""
 "im Scanner nach Tags benutzt."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Scanner zum Umbenennen der Dateien - Zeichensatzkonvertierung"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4168,19 +4198,19 @@ msgstr ""
 "im Scanner nach Dateinamen benutzt."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Scanner zum Verarbeiten der Felder - Zeichensatzkonvertierung"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Wandle die ersten Buchstaben von einigen Präpositionen und Artikeln nicht in "
 "Großbuchstaben um."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4193,15 +4223,15 @@ msgstr ""
 "man 'Text in an Entry' statt 'Text In An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Scannerfenster"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Öffne das Scannerfenster beim Start"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4209,11 +4239,11 @@ msgstr ""
 "Aktiviere diese Option, um beim Start von EasyTAG automatisch das "
 "Scannerfenster zu öffnen."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Scanner-Fenster immer im Vordergrund"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4221,16 +4251,16 @@ msgstr ""
 "Wenn aktiviert, wird das Maskenfenster immer über dem Hauptfenster liegen."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Felder"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Felder werden überschrieben, wenn ein Tag gescannt wird"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4238,11 +4268,11 @@ msgstr ""
 "Scanner ersetzt vorhandenen Text in Feldern mit neuem Inhalt, wenn "
 "aktiviert. Wenn nicht, werden nur leere Felder ausgefüllt."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Standardmäßig diesen Text verwenden :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4251,11 +4281,11 @@ msgstr ""
 "dieser Text in das Kommentarfeld eingetragen werden soll."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "Verwende CRC32 als Standardkommentar (nur für Dateien mit ID3-Tags)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4266,42 +4296,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD-Datenbank"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Servereinstellungen für automatische Suche"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Name :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI-Pfad :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Server-Einstellungen für manuelle Suche"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Lokale CD-Datenbank"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Pfad :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4313,58 +4343,58 @@ msgstr ""
 "'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' und 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Verwende Proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Aktiviere die Einstellungen des Proxy-Servers."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Rechnername :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Name des Proxy-Servers."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Port des Proxy-Servers."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Nutzername :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Nutzername für den Proxy-Server."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Nutzer-Passwort :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Passwort des Nutzers des Proxy-Servers."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Stücknamensliste:"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "Wähle passende Datei (nach Position oder DLM wenn unterhalb aktiviert)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4373,7 +4403,7 @@ msgstr ""
 "passende Datei in der Hauptliste ebenfalls ausgewählt."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4384,15 +4414,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Beenden des Programms bestätigen"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4400,57 +4430,61 @@ msgstr ""
 "Falls aktiviert, öffnet sich eine Dialogbox, um eine Bestätigung zu "
 "erfragen, bevor das Programm beendet wird."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Schreiben des Tags bestätigen"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Umbenennen der Datei bestätigen"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Löschen der Datei bestätigen"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Schreiben der Wiedergabeliste bestätigen"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Wende Änderungen an (ohne zu speichern!) und schließe dieses Fenster"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Dieses Fenster schließen ohne abzuspeichern"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Änderungen speichern und dieses Fenster schließen"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Beispiel: %.*d_-_Stück_Name_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Änderungen angewandt"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Konfiguration gespeichert"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Konfiguration ist unverändert"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4461,37 +4495,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Kein Verzeichnis"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Das Wiedergabeprogramm '%s' wurde nicht gefunden!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Fülle Tag"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Datei und Verzeichnis umbenennen"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Felder verarbeiten"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Tag wurde erfolgreich gescannt..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag wurde erfolgreich gescannt...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4499,23 +4533,23 @@ msgstr ""
 "Tag-Scanner: Seltsam..., die Erweiterung '%s' wurde nicht im Dateinamen '%s' "
 "gefunden!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Scan-Fehler: Separator '%s' in '%s' nicht auffindbar"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 "Konnte den Dateinamen '%s' nicht in die Dateinamenskodierung des Systems "
 "konvertieren."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Neuer Dateinamen wurde erfolgreich gescannt..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Neuer Dateiname wurde erfolgreich gescannt...(%s)"
@@ -4523,41 +4557,41 @@ msgstr "Neuer Dateiname wurde erfolgreich gescannt...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Scan von Tag und Dateinamen"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Scanner :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Typ des zu verwendenden Scanners auswählen"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Öffne Scanner-Fenster / Ausgewählte Dateien scannen"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Scanneroptionen"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Maskeneditor anzeigen/verstecken"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Legende anzeigen/verstecken"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4567,15 +4601,15 @@ msgstr ""
 "zum Ausfüllen der Tag-Felder verwendet."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Tag-Füllungs-Vorschau"
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Stelle aktuellen Pfad vor die Maske"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4588,15 +4622,15 @@ msgstr ""
 "ist, ist es ein absoluter Pfad, ansonsten relativ zum alten Pfad."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Umbenennungs-Vorschau"
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Felder auswählen:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4606,126 +4640,136 @@ msgstr ""
 "Wählen sie die interessanten aus."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Verarbeite Dateinamensfeld"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Titelfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Kü"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Künstlerfeld dieser Datei bearbeiten"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Künstlerfeld dieser Datei bearbeiten"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Albumfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Verarbeite Genrefeld"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "K"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Kommentarfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Ko"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Komponistenfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Originalkünstlerfeld dieser Datei bearbeiten"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Co"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Copyright-Feld verarbeiten"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "URL-Feld verarbeiten"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "K"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Verarbeite Kodiererfeld"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Alle/Keine auswählen."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "'_' und '%20' durch ' ' ersetzen"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Konvertiere :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "nach : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4735,7 +4779,7 @@ msgstr ""
 "(Beispiel, vorher: 'Text%20in%20einem_Eintrag', danach: 'Text in einem "
 "Eintrag')."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4743,18 +4787,18 @@ msgstr ""
 "Ein Leerzeichen wird durch einen Unterstrich ersetzt. \n"
 "Beispiel, vorher: 'Text in einem Eintrag', danach: 'Text_in_einem_Eintrag'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 "Ersetze eine Zeichenkette durch eine andere. Beachten sie, dass die Suche "
 "Groß- und Kleinschreibung unterscheidet."
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr "Erkenne römische Zahlen"
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4762,7 +4806,7 @@ msgstr ""
 "Alle Wörter in allen Feldern werden in Großbuchstaben geschrieben. \n"
 "Beispiel, vorher: 'Text IN EINEM Eintrag', danach: 'TEXT IN EINEM EINTRAG'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4770,7 +4814,7 @@ msgstr ""
 "Wörter in allen Feldern klein schreiben. \n"
 "Beispiel, vorher: 'TEXT IN einem eintrag', danach: 'text in einem eintrag'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4779,7 +4823,7 @@ msgstr ""
 "geschrieben. \n"
 " Beispiel, vorher: 'text IN Einem EINTRAG', danach: 'Text in einem eintrag'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4787,7 +4831,7 @@ msgstr ""
 "Der erste Buchstabe jedes Wortes in allen Feldern wird groß geschrieben. \n"
 "Beispiel, vorher: 'Text in einem EINTRAG', danach: 'Text In Einem Eintrag'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4795,15 +4839,15 @@ msgstr ""
 "Erzwinge Großbuchstaben bei römischen Zahlen, z.B. wird \"ix. text in einem "
 "feld\" zu \"IX. Text In Einem Feld\"."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Vor einem Großbuchstaben ein Leerzeichen einfügen"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Doppelte Leerzeichen oder Unterstriche entfernen"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4811,7 +4855,7 @@ msgstr ""
 "Alle Leerzeichen zwischen Wörtern werden entfernt. \n"
 "Beispiel, vorher: 'Text In Einem Eintrag', danach: 'TextInEinemEintrag'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4819,7 +4863,7 @@ msgstr ""
 "Vor jedem Großbuchstaben wird ein Leerzeichen eingefügt. \n"
 "Beispiel, vorher: 'TextInEinemEintrag', danach: 'Text In Einem Eintrag'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4830,183 +4874,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legende"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : Künstler"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : Künstler"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : Album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : Kommentar"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : Komponist"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : Copyright"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : CD-Nummer"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : Kodierer"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : Genre"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : wird ignoriert"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : Anzahl von Stücken"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : Originalkünstler"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : Stück"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : Titel"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : Jahr"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Maskeneditor"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Neue Maske erstellen"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Maske nach oben bewegen"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Maske nach unten bewegen"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Maske duplizieren"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Vorgabemasken hinzufügen"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Maske löschen"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Masken speichern"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Neue_Maske"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Kopieren: keine Zeile ausgewählt!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Löschen: keine Zeile ausgewählt!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Nach oben bewegen: keine Zeile ausgewählt!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Nach unten bewegen: keine Zeile ausgewählt!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FEHLER: Konfigurationsdatei kann nicht geschrieben werden: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Konfigurationsdatei '%s' kann nicht geöffnet werden (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Standardkonfiguration wird geladen..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Datei '%s' kann nicht geöffnet werden (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "FEHLER: Liste kann nicht in Datei geschrieben werden: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Vorgaben für 'Fülle Tag'-Masken werden geladen..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Vorgabe für 'Datei umbenennen'-Masken werden geladen..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Vorgabe für 'Verzeichnis umbenennen'-Masken werden geladen..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERROR: Die Umgebungsvariable HOME ist nicht definiert!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEHLER: Kann Verzeichnis '%s' nicht anlegen! (%s)"
@@ -5056,7 +5105,7 @@ msgstr ""
 
 #. Log_Print(_("DLL '%s' not already loaded. Try loading it..."), dllname);
 #: src/win32/win32dep.c:122
-#, fuzzy, c-format
+#, c-format
 msgid "DLL '%s' not already loaded. Try loading it..."
 msgstr "DLL '%s' nicht gefunden. Versuche sie zu laden..."
 
@@ -5087,9 +5136,8 @@ msgstr "Verzeichnis für EasyTAG-Einstellungen: '%s'"
 
 #. Log_Print(_("weasytag_init start..."));
 #: src/win32/win32dep.c:469
-#, fuzzy
 msgid "weasytag_init start..."
-msgstr "Bereit zum Start..."
+msgstr "weasytag_init Start..."
 
 #. Log_Print(_("EasyTAG version: %s"),VERSION);
 #. g_print(_("EasyTAG version: %s"),VERSION);
@@ -5097,13 +5145,13 @@ msgstr "Bereit zum Start..."
 #: src/win32/win32dep.c:475
 #, c-format
 msgid "Glib version: %u.%u.%u\n"
-msgstr ""
+msgstr "Glib Version: %u.%u.%u\n"
 
 #. Set Environmental Variables
 #. Log_Print(_("weasytag_init end..."));
 #: src/win32/win32dep.c:493
 msgid "weasytag_init end..."
-msgstr ""
+msgstr "weasytag_init end..."
 
 #. Log_Print(_("Audio player: '%s'"), player);
 #: src/win32/win32dep.c:614
@@ -5241,9 +5289,9 @@ msgstr "Audio-Player: '%s'"
 #~ "for writing ID3 tags', it will be used instead of ISO-8859-1.\n"
 #~ "Also some rules can be defined if some characters can't be converted."
 #~ msgstr ""
-#~ "Der UNICODE-Zeichensatz wird verwendet, wenn die Umwandlung nach ISO-8859-"
-#~ "1 fehlschlägt. Unicode kann für ID3v2 aber nicht für ID3v1-Tags, welche "
-#~ "nur Ein-Byte-Zeichensätze unterstützen (standardmäßig ISO-8859-1), "
+#~ "Der UNICODE-Zeichensatz wird verwendet, wenn die Umwandlung nach "
+#~ "ISO-8859-1 fehlschlägt. Unicode kann für ID3v2 aber nicht für ID3v1-Tags, "
+#~ "welche nur Ein-Byte-Zeichensätze unterstützen (standardmäßig ISO-8859-1), "
 #~ "verwendet werden.\n"
 #~ "\n"
 #~ "Wenn ein anderer Zeichensatz mit 'Verwende Nicht-Standardzeichensatz zum "
diff --git a/po/easytag.pot b/po/easytag.pot
index 5fe010c..3b3161b 100644
--- a/po/easytag.pot
+++ b/po/easytag.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,6 +25,7 @@ msgid ""
 msgstr ""
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr ""
 
@@ -103,137 +105,137 @@ msgstr ""
 msgid "(Serbian translation)"
 msgstr ""
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr ""
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr ""
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr ""
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr ""
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr ""
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr ""
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr ""
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr ""
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr ""
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr ""
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr ""
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr ""
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr ""
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr ""
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr ""
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr ""
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr ""
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr ""
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr ""
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr ""
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr ""
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr ""
@@ -241,480 +243,488 @@ msgstr ""
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr ""
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr ""
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr ""
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr ""
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr ""
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr ""
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr ""
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr ""
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr ""
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr ""
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr ""
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr ""
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr ""
 
-#: src/bar.c:159
+#: src/bar.c:161
+msgid "Ascending by album artist"
+msgstr ""
+
+#: src/bar.c:162
+msgid "Descending by album artist"
+msgstr ""
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr ""
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr ""
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr ""
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr ""
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr ""
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr ""
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr ""
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr ""
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr ""
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr ""
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr ""
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr ""
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr ""
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr ""
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr ""
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr ""
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr ""
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr ""
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr ""
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr ""
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr ""
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr ""
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr ""
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr ""
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr ""
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr ""
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr ""
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr ""
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr ""
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr ""
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr ""
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr ""
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr ""
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr ""
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr ""
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr ""
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr ""
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr ""
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr ""
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr ""
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr ""
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr ""
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr ""
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr ""
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr ""
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr ""
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr ""
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr ""
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr ""
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr ""
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr ""
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr ""
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr ""
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr ""
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr ""
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr ""
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr ""
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr ""
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr ""
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr ""
 
-#: src/bar.c:211
+#: src/bar.c:215
 msgid "Go to Desktop Directory"
 msgstr ""
 
-#: src/bar.c:212
+#: src/bar.c:216
 msgid "Go to Documents Directory"
 msgstr ""
 
-#: src/bar.c:213
+#: src/bar.c:217
 msgid "Go to Downloads Directory"
 msgstr ""
 
-#: src/bar.c:214
+#: src/bar.c:218
 msgid "Go to Music Directory"
 msgstr ""
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr ""
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr ""
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr ""
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr ""
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr ""
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr ""
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr ""
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr ""
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr ""
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr ""
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr ""
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr ""
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr ""
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr ""
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr ""
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr ""
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr ""
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr ""
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr ""
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr ""
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr ""
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr ""
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr ""
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr ""
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr ""
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr ""
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr ""
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr ""
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr ""
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr ""
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr ""
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr ""
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr ""
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr ""
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr ""
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr ""
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr ""
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr ""
 
@@ -723,7 +733,7 @@ msgid "New default path for files selected"
 msgstr ""
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr ""
 
@@ -733,148 +743,152 @@ msgid ""
 "Do you want to save them before changing the directory?"
 msgstr ""
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr ""
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr ""
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr ""
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr ""
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr ""
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+msgid "Album Artist"
+msgstr ""
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr ""
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr ""
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr ""
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr ""
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr ""
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr ""
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr ""
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr ""
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 msgid "Encoded By"
 msgstr ""
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr ""
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr ""
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr ""
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 msgid "Select a directory to browse."
 msgstr ""
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 msgid "... file(s)"
 msgstr ""
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr ""
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr ""
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr ""
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr ""
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
 msgstr ""
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr ""
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr ""
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr ""
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr ""
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -907,14 +921,14 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -924,99 +938,99 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr ""
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr ""
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr ""
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr ""
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr ""
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr ""
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr ""
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr ""
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr ""
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr ""
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr ""
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr ""
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr ""
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr ""
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
 msgstr ""
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr ""
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1025,137 +1039,137 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr ""
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr ""
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr ""
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr ""
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr ""
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr ""
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr ""
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr ""
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr ""
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr ""
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr ""
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr ""
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr ""
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr ""
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr ""
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr ""
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr ""
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr ""
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr ""
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr ""
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr ""
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr ""
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr ""
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr ""
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr ""
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr ""
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr ""
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr ""
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1165,36 +1179,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr ""
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr ""
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr ""
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr ""
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr ""
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1203,90 +1217,94 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr ""
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr ""
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr ""
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr ""
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr ""
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr ""
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr ""
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr ""
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr ""
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr ""
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr ""
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr ""
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr ""
@@ -1295,89 +1313,90 @@ msgstr ""
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr ""
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr ""
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr ""
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr ""
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr ""
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr ""
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr ""
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr ""
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr ""
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr ""
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr ""
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr ""
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1386,7 +1405,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr ""
 
@@ -1644,7 +1663,7 @@ msgstr ""
 msgid "Browser"
 msgstr ""
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr ""
 
@@ -1658,11 +1677,11 @@ msgstr ""
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr ""
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr ""
 
@@ -1670,7 +1689,7 @@ msgstr ""
 msgid "Bitrate:"
 msgstr ""
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr ""
 
@@ -1678,17 +1697,17 @@ msgstr ""
 msgid "Freq:"
 msgstr ""
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr ""
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr ""
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr ""
 
@@ -1705,7 +1724,7 @@ msgid "Time:"
 msgstr ""
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr ""
 
@@ -1734,345 +1753,362 @@ msgstr ""
 msgid "Tag selected files with this artist"
 msgstr ""
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+msgid "Album Artist:"
+msgstr ""
+
+#: src/easytag.c:666
+msgid "Tag selected files with this album artist"
+msgstr ""
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr ""
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr ""
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr ""
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr ""
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr ""
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr ""
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr ""
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr ""
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr ""
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr ""
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr ""
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr ""
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr ""
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr ""
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr ""
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr ""
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr ""
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr ""
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr ""
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr ""
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr ""
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr ""
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr ""
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr ""
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr ""
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr ""
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr ""
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr ""
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr ""
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr ""
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr ""
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr ""
+
+#: src/easytag.c:1240
+msgid "Removed album artist from selected files."
+msgstr ""
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr ""
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr ""
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr ""
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr ""
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr ""
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr ""
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr ""
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr ""
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr ""
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr ""
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr ""
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr ""
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr ""
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr ""
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr ""
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr ""
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr ""
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr ""
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr ""
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr ""
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr ""
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr ""
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr ""
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr ""
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr ""
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 msgid "Saving File(s)..."
 msgstr ""
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr ""
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr ""
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr ""
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
 "'%s' ?"
 msgstr ""
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr ""
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr ""
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2082,11 +2118,11 @@ msgid ""
 msgstr ""
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr ""
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2096,11 +2132,11 @@ msgid ""
 msgstr ""
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr ""
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2109,36 +2145,36 @@ msgid ""
 "'%s' ?"
 msgstr ""
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr ""
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr ""
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr ""
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2147,16 +2183,16 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr ""
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2165,12 +2201,12 @@ msgid ""
 "'%s'"
 msgstr ""
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2178,22 +2214,22 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr ""
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr ""
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2201,23 +2237,23 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr ""
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr ""
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2226,32 +2262,32 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr ""
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
 "'%s' ?"
 msgstr ""
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr ""
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr ""
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2260,120 +2296,119 @@ msgid ""
 msgstr ""
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr ""
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr ""
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr ""
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr ""
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr ""
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr ""
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr ""
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr ""
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr ""
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr ""
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr ""
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr ""
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr ""
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr ""
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr ""
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr ""
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr ""
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr ""
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr ""
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr ""
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr ""
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
 "reproduce it to easytag at gmail.com"
 msgstr ""
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr ""
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2392,92 +2427,92 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr ""
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
 msgstr ""
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr ""
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr ""
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr ""
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr ""
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr ""
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr ""
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr ""
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr ""
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr ""
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr ""
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr ""
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr ""
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr ""
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr ""
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr ""
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2485,14 +2520,14 @@ msgid "%d kb/s"
 msgstr ""
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr ""
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2500,11 +2535,11 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr ""
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2528,54 +2563,54 @@ msgstr ""
 msgid "Channels:"
 msgstr ""
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr ""
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr ""
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr ""
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2590,84 +2625,84 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr ""
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr ""
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr ""
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr ""
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr ""
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr ""
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr ""
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr ""
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr ""
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr ""
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr ""
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr ""
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr ""
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr ""
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr ""
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr ""
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr ""
 
@@ -2675,263 +2710,263 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr ""
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr ""
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr ""
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr ""
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr ""
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr ""
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr ""
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr ""
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr ""
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr ""
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr ""
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr ""
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr ""
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr ""
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr ""
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr ""
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr ""
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr ""
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr ""
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr ""
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr ""
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr ""
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr ""
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
 "Overwrite?"
 msgstr ""
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr ""
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
 "(%s)"
 msgstr ""
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr ""
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr ""
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr ""
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr ""
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr ""
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr ""
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr ""
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr ""
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr ""
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr ""
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr ""
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr ""
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr ""
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr ""
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr ""
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
 msgstr ""
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr ""
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr ""
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr ""
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr ""
 
@@ -3011,12 +3046,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr ""
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr ""
@@ -3577,7 +3612,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3590,7 +3625,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3723,33 +3758,44 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr ""
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr ""
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr ""
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr ""
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr ""
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3758,86 +3804,86 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr ""
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr ""
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr ""
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr ""
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr ""
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr ""
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -3846,59 +3892,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr ""
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr ""
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr ""
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr ""
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr ""
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr ""
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -3907,62 +3953,62 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr ""
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr ""
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr ""
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr ""
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr ""
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr ""
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr ""
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -3971,42 +4017,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr ""
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr ""
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr ""
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr ""
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr ""
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr ""
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4015,65 +4061,65 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr ""
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr ""
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr ""
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr ""
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr ""
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr ""
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr ""
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr ""
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
 msgstr ""
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4082,71 +4128,75 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr ""
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr ""
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr ""
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr ""
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr ""
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr ""
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr ""
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr ""
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr ""
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr ""
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr ""
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr ""
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4154,57 +4204,57 @@ msgid ""
 "(%s) "
 msgstr ""
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr ""
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr ""
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr ""
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr ""
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr ""
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr ""
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr ""
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr ""
@@ -4212,56 +4262,56 @@ msgstr ""
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr ""
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr ""
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr ""
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr ""
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr ""
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr ""
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr ""
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr ""
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr ""
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4270,212 +4320,221 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr ""
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr ""
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
 msgstr ""
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr ""
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr ""
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr ""
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr ""
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+msgid "Process album artist field"
+msgstr ""
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr ""
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr ""
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr ""
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr ""
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr ""
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr ""
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr ""
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr ""
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr ""
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr ""
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr ""
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr ""
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr ""
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
 msgstr ""
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr ""
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr ""
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4484,183 +4543,187 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr ""
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr ""
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+msgid "%z : album artist"
+msgstr ""
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr ""
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr ""
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr ""
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr ""
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr ""
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr ""
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr ""
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr ""
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr ""
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr ""
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr ""
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr ""
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr ""
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr ""
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr ""
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr ""
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr ""
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr ""
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr ""
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr ""
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr ""
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr ""
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr ""
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr ""
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr ""
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr ""
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr ""
diff --git a/po/el.gmo b/po/el.gmo
index f9aa9a9..aed2282 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 8bf531f..70543e4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2005-12-26 16:40+0200\n"
 "Last-Translator: Apollon Oikonomopoulos <apoikos at mail.ntua.gr>\n"
 "Language-Team: Modern Greek <el at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,6 +33,7 @@ msgstr ""
 "åôéêåôþí óôï GNU/Linux ðáé÷íßäé!"
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(ÃåñìáíéêÞ ìåôÜöñáóç)"
 
@@ -115,111 +117,111 @@ msgstr "(
 msgid "(Serbian translation)"
 msgstr "(ÃåñìáíéêÞ ìåôÜöñáóç)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Ó÷üëéï"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Ðåñß..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Ðåñß"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(ÄçìéïõñãÞèçêå: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(×ñçóéìïðïéåß: GTK+ %d.%d.%d êáé id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Äçìéïõñãüò: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Éóôïóåëßäá:"
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "ÐåñéãñáöÞ:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(×ùñßò õðïóôÞñéîç áñ÷åßùí MP3)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(×ùñßò õðïóôÞñéîç áñ÷åßùí MP3)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Äåí õðÜñ÷åé äéáèÝóéìç ìíÞìç"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(×ùñßò õðïóôÞñéîç áñ÷åßùí Ogg Vorbis)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(×ùñßò õðïóôÞñéîç áñ÷åßùí MP3)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(×ùñßò õðïóôÞñéîç áñ÷åßùí FLAC)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(×ùñßò õðïóôÞñéîç áñ÷åßùí MP4/AAC)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(×ùñßò õðïóôÞñéîç áñ÷åßùí MP3)"
@@ -227,33 +229,33 @@ msgstr "(
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Åõ÷áñéóôßåò"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "ÌåôáöñÜóåéò:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "ÃåíéêÜ:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Éóôïñéêü áëëáãþí"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Áäõíáìßá áíïßãìáôïò ôïõ áñ÷åßïõ '%s' (%s)"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ÓÖÁËÌÁ êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ:  '%s' (%s)."
@@ -261,484 +263,494 @@ msgstr "
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Áñ÷åßï"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Ôáîéíüìçóç ëßóôáò êáôÜ åôéêÝôá"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Ôáîéíüìçóç ëßóôáò êáôÜ éäéüôçôá"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Áýîïõóá, êáôÜ üíïìá áñ÷åßïõ"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Öèßíïõóá, êáôÜ üíïìá áñ÷åßïõ"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Áýîïõóá, êáôÜ çìåñïìçíßá äçìéïõñãßáò"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Öèßíïõóá, êáôÜ çìåñïìçíßá äçìéïõñãßáò"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Áýîïõóá, êáôÜ áñéèìü êïììáôéïý"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Öèßíïõóá, êáôÜ áñéèìü êïììáôéïý"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Áýîïõóá, êáôÜ ôßôëï"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Öèßíïõóá, êáôÜ ôßôëï"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Áýîïõóá, êáôÜ üíïìá êáëëéôÝ÷íç"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Öèßíïõóá, êáôÜ üíïìá êáëëéôÝ÷íç"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Áýîïõóá, êáôÜ üíïìá êáëëéôÝ÷íç"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Öèßíïõóá, êáôÜ üíïìá êáëëéôÝ÷íç"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Áýîïõóá, êáôÜ ôßôëï äßóêïõ"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Öèßíïõóá, êáôÜ ôßôëï äßóêïõ"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Áýîïõóá, êáôÜ ÷ñïíéÜ"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Öèßíïõóá, êáôÜ ÷ñïíéÜ"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Áýîïõóá, êáôÜ åßäïò"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Öèßíïõóá, êáôÜ åßäïò"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Áýîïõóá, êáôÜ ó÷üëéï"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Öèßíïõóá, êáôÜ ó÷üëéï"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Áýîïõóá, êáôÜ üíïìá óõíèÝôç"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Öèßíïõóá, êáôÜ üíïìá óõíèÝôç"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Áýîïõóá, êáôÜ üíïìá áñ÷éêïý êáëëéôÝ÷íç"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Öèßíïõóá, êáôÜ üíïìá áñ÷éêïý êáëëéôÝ÷íç"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Áýîïõóá, êáôÜ copyright"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Öèßíïõóá, êáôÜ copyright"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Áýîïõóá, êáôÜ URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Öèßíïõóá, êáôÜ URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Áýîïõóá, êáôÜ üíïìá êùäéêïðïéçôÞ"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Öèßíïõóá, êáôÜ üíïìá êùäéêïðïéçôÞ"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Áýîïõóá, êáôÜ ôýðï áñ÷åßïõ"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Öèßíïõóá, êáôÜ ôýðï áñ÷åßïõ"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Áýîïõóá, êáôÜ ìÝãåèïò áñ÷åßïõ"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Öèßíïõóá, êáôÜ ìÝãåèïò áñ÷åßïõ"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Áýîïõóá, êáôÜ äéÜñêåéá"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Öèßíïõóá, êáôÜ äéÜñêåéá"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Áýîïõóá, êáôÜ bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Öèßíïõóá, êáôÜ bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Áýîïõóá, êáôÜ ñõèìü äåéãìáôïëçøßáò"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Öèßíïõóá, êáôÜ ñõèìü äåéãìáôïëçøßáò"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "¶íïéãìá áñ÷åßïõ/ùí ìå..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "ÅðéëïãÞ üëùí ôùí áñ÷åßùí"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "ÁðïåðéëïãÞ üëùí ôùí áñ÷åßùí"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "ÁíôéóôñïöÞ åðéëïãÞò áñ÷åßùí"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "ÄéáãñáöÞ áñ÷åßïõ/ùí"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Ðñþôï áñ÷åßï"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Ðñþôï áñ÷åßï"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Ð_ñïçãïýìåíï áñ÷åßï"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Ðñïçãïýìåíï áñ÷åßï"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Åðüìåíï áñ÷åßï"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Åðüìåíï áñ÷åßï"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Ôåëåõôáßï áñ÷åßï"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Ôåëåõôáßï áñ÷åßï"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "_ÓÜñùóç áñ÷åßïõ/ùí"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "¶íïéãìá ðáñáèýñïõ óáñùôÞ / óÜñùóç áñ÷åßïõ/ùí"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "Á_öáßñåóç åôéêÝôáò"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Áöáßñåóç åôéêÝôáò"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "Á_íáßñåóç ôåëåõôáßùí áëëáãþí óå áñ÷åßá"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Áíáßñåóç ôåëåõôáßùí áëëáãþí óå áñ÷åßá"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "Å_ðáíÜëçøç ôåëåõôáßùí áëëáãþí óå áñ÷åßá"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "ÅðáíÜëçøç ôåëåõôáßùí áëëáãþí óå áñ÷åßá"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "Áðï_èÞêåõóç áñ÷åßïõ/ùí"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "ÁðïèÞêåõóç áñ÷åßïõ/ùí"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "_ÏðùóäÞðïôå áðïèÞêåõóç ôïõ áñ÷åßïõ/ôùí áñ÷åßùí."
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "ÏðùóäÞðïôå áðïèÞêåõóç ôïõ áñ÷åßïõ/ôùí áñ÷åßùí."
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Áíáßñåóç ôåëåõôáßùí áëëáãþí"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "ÅðáíÜëçøç ôåëåõôáßùí áëëáãþí"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "¸_îïäïò"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "¸îïäïò"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_ÐåñéçãçôÞò"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "ÌåôÜâáóç óôïí Ðñïóùðéêü _ÊáôÜëïãï"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "ÌåôÜâáóç óôïí Ðñïóùðéêü ÊáôÜëïãï"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "ÌåôÜâáóç óôïí Áñ÷éêü ÊáôÜëïãï"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "ÌåôÜâáóç óôïí Ðñïóùðéêü ÊáôÜëïãï"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "ÌåôÜâáóç óôïí Ðñïóùðéêü ÊáôÜëïãï"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "ÌåôÜâáóç óôïí Ðñïóùðéêü ÊáôÜëïãï"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "ÌåôÜâáóç óôïí _Áñ÷éêü ÊáôÜëïãï"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "ÌåôÜâáóç óôïí Áñ÷éêü ÊáôÜëïãï"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "_Ïñéóìüò ôïõ ôñÝ÷ïíôïò êáôáëüãïõ ùò áñ÷éêïý"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Ïñéóìüò ôïõ ôñÝ÷ïíôïò êáôáëüãïõ ùò áñ÷éêïý"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "¼øç äÝíäñïõ | ¼øç ÊáëëéôÝ÷íç - Äßóêïõ"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Ìåôïíïìáóßá êáôáëüãïõ..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Åðáíáöüñôùóç êáôáëüãïõ"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "¶íïéãìá êáôáëüãïõ ìå..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Óýìðôõîç äÝíäñïõ"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "Á_íáíÝùóç äÝíäñïõ"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "_ÓáñùôÞò"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "Ó_õìðëÞñùóç åôéêÝôáò..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "ÓõìðëÞñùóç åôéêÝôáò..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Ìåôïíïìáóßá áñ÷åßïõ/ùí êáé êáôáëüãïõ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Ìåôïíïìáóßá áñ÷åßïõ/ùí êáé êáôáëüãïõ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Åðåîåñãáóßá ðåäßïõ/ùí.."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Åðåîåñãáóßá ðåäßïõ/ùí.."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_ËïéðÜ"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "ÁíáæÞôçóç _áñ÷åßïõ/ùí"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "ÁíáæÞôçóç áñ÷åßïõ/ùí"
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "ÁíáæÞôçóç óôç ÂÜóç ÄåäïìÝíùí CD..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "ÁíáæÞôçóç CDDB..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Öüñôùóç ïíïìÜôùí áñ÷åßùí áðü TXT..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "ÁðïèÞêåõóç ëßóôáò áíáðáñáãùãÞò"
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "ÅêôÝëåóç áíáðáñáãùãÝá ìïõóéêÞò"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Ñõèìßóåéò"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_ÐñïôéìÞóåéò..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "ÐñïôéìÞóåéò..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_ÂïÞèåéá"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Ðåñß"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Ôåñìáôéóìüò ôçò ôñÝ÷ïõóáò åíÝñãåéáò"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "ÅíÝñãåéåò óå áñ÷åßá"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "ÁíáæÞôçóç áñ÷åßïõ/ùí óôç CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "ÐåñéÞãçóç óôïõò _õðïêáôáëüãïõò"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "ÅìöÜíéóç ôùí êñõöþí êáôáëüãùí"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "ÅìöÜíéóç äÝíäñïõ / ÅìöÜíéóç êáôÜ ÊáëëéôÝ÷íç êáé Äßóêï"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Could not merge UI, error was: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "¸ôïéìï ãéá åêêßíçóç..."
 
@@ -747,7 +759,7 @@ msgid "New default path for files selected"
 msgstr "ÅðéëÝ÷èçêå íÝá åñÞìçí äéáäñïìÞ ãéá ôá áñ÷åßá"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Åðéâåâáßùóç..."
 
@@ -759,88 +771,93 @@ msgstr ""
 "ÏñéóìÝíá áñ÷åßá Ý÷ïõí ôñïðïðïéçèåß ÷ùñßò íá áðïèçêåõèïýí ïé áëëáãÝò...\n"
 "ÈÝëåôå íá ôá áðïèçêåýóåôå ðñïôïý åãêáôáëåßøåôå ôïí êáôÜëïãï;"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Äßóêùí"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "ÓöÜëìá êáôÜ ôçí áíáæÞôçóç ãéá %s: Äå âñÝèçêå êüìâïò %s óôï äÝíäñï."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "ÄÝíäñï"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "¼íïìá áñ÷åßïõ"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Ôßôëï"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "ÊáëëéôÝ÷íçò"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "ÊáëëéôÝ÷íçò"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Äßóêïò"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "×ñïíéÜ"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Ôßôëïò êïììáôéïý"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Åßäïò"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "ÓõíèÝôçò"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Áñ÷éêüò êáëëéôÝ÷íçò"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "Éóôïóåëßäá"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "ÊùäéêïðïéÞèçêå áðü"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Äßóêùí"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Áñ÷åßùí"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "ÌåôÜâáóç óôï ãïíéêü êáôÜëïãï"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Äþóôå ôç äéáäñïìÞ ôïõ êáôáëüãïõ óôïí ïðïßï èÝëåôå íá ðåñéçãçèåßôå"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "ÅðéëÝîôå Ýíáí êáôÜëïãï ãéá ðåñéÞãçóç!"
@@ -848,35 +865,35 @@ msgstr "
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u áñ÷åßï/á"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "ÊáëëéôÝ÷çò & Äßóêïò"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Ìåôïíïìáóßá ôïõ êáôáëüãïõ"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Ìåôïíïìáóßá ôïõ êáôáëüãïõ '%s' óå:"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "ÌÜóêá:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "Áí åíåñãïðïéçèåß ç åðéëïãÞ áõôÞ, ôüôå ïé ìÜóêåò èá ÷ñçóéìïðïéçèïýí ãéá ôç "
 "ìåôïíïìáóßá ôïõ êáôáëüãïõ."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -884,31 +901,31 @@ msgstr ""
 "ÅðéëÝîôå Þ ðëçêôñïëïãÞóôå ìßá ìÜóêá ÷ñçóéìïðïéþíôáò ôïõò êùäéêïýò (âë. "
 "õðüìíçìá) ãéá íá ìåôïíïìáóôåß ï êáôÜëïãïò âÜóåé ôùí ðåäßùí ôçò åôéêÝôáò."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "ÁêáôÜëëçëç ìÜóêá óÜñùóçò"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Ðñïåðéóêüðçóç ìåôïíïìáóßáòêáôáëüãïõ."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "ÓöÜëìá..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "ÐñÝðåé íá ðëçêôñïëïãÞóåôå Ýíá üíïìá êáôáëüãïõ!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -943,7 +960,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -952,7 +969,7 @@ msgstr ""
 "ÕðÜñ÷åé Þäç êáôÜëïãïò ìå áõôü ôï üíïìá!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -967,89 +984,89 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Ï êáôÜëïãïò ìåôïíïìÜóôçêå"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Ðñüãñáììá ðñïò åêôÝëåóç:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "ÐëçêôñïëïãÞóôå ôï üíïìá ôïõ ðñïò åêôÝëåóç ðñïãñÜììáôïò. Èá ëÜâåé ôï üíïìá "
 "ôïõ ôñÝ÷ïíôïò êáôáëüãïõ ùò ðáñÜìåôñï."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "¶íïéãìá áñ÷åßïõ ìå..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "ÐëçêôñïëïãÞóôå ôï üíïìá ôïõ ðñïò åêôÝëåóç ðñïãñÜììáôïò. Èá ëÜâåé ôï üíïìá "
 "ôïõ ôñÝ÷ïíôïò áñ÷åßïõ ùò ðáñÜìåôñï."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "ÐñÝðåé íá ðëçêôñïëïãÞóåôå Ýíá üíïìá ðñïãñÜììáôïò!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Ç åöáñìïãÞ '%s' äå âñÝèçêå!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Äåí åßíáé äõíáôÞ ç åêôÝëåóç ôïõ %s (óöÜëìá %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Áäõíáìßá äçìéïõñãßáò íÝáò äéåñãáóßáò (forking)!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "ÅêôåëÝóôçêå ç åíôïëÞ: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "ÊáëëéôÝ÷íçò / Äßóêïò"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Êáôçãïñßá"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Ôßôëïò êïììáôéïý"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "ÄéÜñêåéá"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "ÁíáæÞôçóç óôç ÂÜóç ÄåäïìÝíùí CD"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Áõôüìáôç áíáæÞôçóç"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Åðåñþôçóç ÂÜóçò ÄåäïìÝíùí FreeDB:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1057,16 +1074,16 @@ msgstr ""
 "Áõôüìáôç åðåñþôçóç ôçò ÂÜóçò ÄåäïìÝíùí CDDB, ÷ñçóéìïðïéþíôáò ôá åðéëåãìÝíá "
 "áñ÷åßá ãéá ôç äçìéïõñãßá ôïõ CddbID (ç óåéñÜ ôùí áñ÷åßùí Ý÷åé óçìáóßá!)."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Ôåñìáôéóìüò áíáæÞôçóçò..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1078,138 +1095,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "×åéñïêßíçôç áíáæÞôçóç"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "ËÝîåéò:"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "ÐëçêôñïëïãÞóôå ôéò ëÝîåéò ãéá áíáæÞôçóç (÷ùñéóìÝíåò ìå êåíÜ Þ '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "ÁíáæÞôçóç óå:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "¼ëá ôá ðåäßá"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "¶ëëï"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "¼ëåò ïé êáôçãïñßåò"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "ÊëáóéêÞ"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "¶ëëï"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "ðåñéëáìâÜíåé: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "ôáéíßåò, åêðïìðÝò"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "Üëëá, ðïõ äåí åìðßðôïõí óôéò ðáñáðÜíù êáôçãïñßåò"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Êáôçãïñßåò"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "ÁðïôåëÝóìáôá:"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "ÁíáæÞôçóç:"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "ÐëçêôñïëïãÞóôå üñïõò ãéá áíáæÞôçóç ìåôáîý ôùí áðïôåëåóìÜôùí"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "ÁíáæÞôçóç åðüìåíïõ"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "ÁíáæÞôçóç ðñïçãïýìåíïõ"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "ÅìöÜíéóç ìüíï ôùí êüêêéíùí ãñáììþí / ÅìöÜíéóç üëùí"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "ÁðïåðéëïãÞ üëùí ôùí ãñáììþí"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "ÁíôéóôñïöÞ åðéëïãÞò"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "ÅðéëïãÞ üëùí ôùí ãñáììþí"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1223,36 +1240,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Ðåäßá ðñïò óõìðëÞñùóç:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "¼ëá"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Á/Á êïììáôéïý"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "Áñ. êïììáôéþí"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "ÓÜñùóç êÜèå áñ÷åßïõ ìå ôéò ôñÝ÷ïõóåò ñõèìßóåéò óÜñùóçò"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1266,17 +1283,17 @@ msgstr ""
 "óõìðåñéöïñÜ, üðïõ êÜèå áñ÷åßï ôáéñéÜæåôáé óôçí áíôßóôïé÷ç åããñáöÞ ôçò CDDB "
 "ìå âÜóç ôç èÝóç ôïõ."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Öüñôùóç ôùí åðéëåãìÝíùí Þ üëùí ôùí ãñáììþí (áí äåí Ý÷åé åðéëåãåß êÜðïéá "
 "ãñáììÞ)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "¸ôïéìï ãéá áíáæÞôçóç..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1284,76 +1301,80 @@ msgstr ""
 "Äßóêïò: '%s', êáëëéôÝ÷íçò: '%s', äéÜñêåéá: '%s', ÷ñïíéÜ: '%s', åßäïò: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "ÁíôéóôñïöÞ åðéëïãÞò"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Ôáîéíüìçóç êáôÜ áýîïíôá áñéèìü êïììáôéïý"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Ôáîéíüìçóç êáôÜ üíïìá êïììáôéïý"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "ÁíáæÞôçóç õðïëïãéóôÞ  '%s'..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Ï õðïëïãéóôÞò '%s' (%s) äå âñÝèçêå!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Áäõíáìßá äçìéïõñãßáò íÝïõ socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Óýíäåóç ìå ôïí õðïëïãéóôÞ '%s', èýñá '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Áäõíáìßá óýíäåóçò ìå ôïí õðïëïãéóôÞ  '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Åðéôõ÷Þò óýíäåóç ìå ôïí õðïëïãéóôÞ '%s'."
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "ËÞøç äåäïìÝíùí (%s)..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "ÓöÜëìá êáôÜ ôçí áöáßñåóç ôçò åôéêÝôáò ID3v1 ôïõ '%s' (%s)\n"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Áäõíáìßá äçìéïõñãßáò Þ áíïßãìáôïò ôïõ áñ÷åßïõ '%s' (%s)\n"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Áäõíáìßá áíïßãìáôïò ôïõ áñ÷åßïõ '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "ÁðïóôïëÞ áßôçóçò..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Áäõíáìßá áðïóôïëÞò áßôçóçò (%s)!"
@@ -1362,93 +1383,94 @@ msgstr "
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "ËÞøç äåäïìÝíùí..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Ï åîõðçñåôçôÞò Ýäùóå ëáíèáóìÝíç áðÜíôçóç! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Ï åîõðçñåôçôÞò Ýäùóå ëáíèáóìÝíç áðÜíôçóç! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 "Óõããíþìç, ôï óýóôçìá áíáæÞôçóçò ìÝóù ôïõ éóôïý åßíáé åêôüò ëåéôïõñãßáò!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "ÂñÝèçêáí %d äßóêïò/äßóêïé ðïõ ôáéñéÜæïõí óôá êñéôÞñéá áíáæÞôçóçò"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "ËÞøç äåäïìÝíùí (%s)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "ËÞøç äåäïìÝíùí (%s)..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Äåí Ý÷åé åðéëåãåß êáíÝíá áñ÷åßï!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "ÅðéëÝ÷ôçêáí %d áñ÷åßá!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "¸ôïéìï ãéá áíáæÞôçóç..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 "ÁðïóôïëÞ áßôçóçò (CddbId: %s, # êïììáôéþí: %d, : äéÜñêåéá äßóêïõ:%d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "ÂñÝèçêáí %d äßóêïò/äßóêïé ðïõ ôáéñéÜæïõí óôá êñéôÞñéá áíáæÞôçóçò"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Áäõíáìßá áíïßãìáôïò ôïõ áñ÷åßïõ '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Öüñôùóç ëßóôáò êïììáôéþí äßóêïõ"
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1461,7 +1483,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "ÓõìðëÞñùóç åôéêÝôáò áðü ôç CDDB..."
 
@@ -1650,8 +1672,8 @@ msgstr "
 #, fuzzy, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
-"Áäõíáìßá ìåôáôñïðÞò ôïõ ïíüìáôïò áñ÷åßùí '%s' óôï óýíïëï ÷áñáêôÞñùí UTF-8 (%"
-"s) \n"
+"Áäõíáìßá ìåôáôñïðÞò ôïõ ïíüìáôïò áñ÷åßùí '%s' óôï óýíïëï ÷áñáêôÞñùí UTF-8 "
+"(%s) \n"
 
 #: src/charset.c:545 src/charset.c:644 src/charset.c:708
 msgid "Invalid UTF-8"
@@ -1669,8 +1691,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
-"Áäõíáìßá ìåôáôñïðÞò ôïõ ïíüìáôïò áñ÷åßùí '%s' óôï óýíïëï ÷áñáêôÞñùí UTF-8 (%"
-"s) \n"
+"Áäõíáìßá ìåôáôñïðÞò ôïõ ïíüìáôïò áñ÷åßùí '%s' óôï óýíïëï ÷áñáêôÞñùí UTF-8 "
+"(%s) \n"
 
 #. Starting messages
 #: src/easytag.c:198
@@ -1725,7 +1747,7 @@ msgstr ""
 msgid "Browser"
 msgstr "ÐåñéçãçôÞò"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ"
 
@@ -1739,11 +1761,11 @@ msgstr "
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1751,7 +1773,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1759,17 +1781,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Óõ÷íüôçôá:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "ÌïñöÞ:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1786,7 +1808,7 @@ msgid "Time:"
 msgstr "ÄéÜñêåéá:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "ÅôéêÝôá"
 
@@ -1816,48 +1838,60 @@ msgid "Tag selected files with this artist"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôü ôï üíïìá êáëëéôÝ÷íç"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "ÊáëëéôÝ÷íçò:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr ""
+"ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôü ôï üíïìá êáëëéôÝ÷íç"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Äßóêïò:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôüí ôïí ôßôëï äßóêïõ"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôüí ôïí áýîïíôá áñéèìü "
 "äßóêïõ"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "×ñïíéÜ:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôÞ ôç ÷ñïíéÜ"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Äéáäï÷éêÞ áñßèìçóç ôùí áñ÷åßùí. ÎåêéíÜ ìå 01 óå êÜèå õðïêáôÜëïãï."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Á/Á êïììáôéïý:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1865,78 +1899,78 @@ msgstr ""
 "ÓõìðëÞñùóç ôïõ ðåäßïõ «áñéèìüò êïììáôéþí» êÜèå áñ÷åßïõ ìå ôïí áñéèìü ôùí "
 "áñ÷åßùí ðïõ âñßóêïíôáé óôïí ßäéï õðïêáôÜëïãï ìå áõôü."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôüí ôïí áñéèìü êïììáôéþí"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Åßäïò:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôü ôï åßäïò"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Ó÷üëéï:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôüí ôï ó÷üëéï:"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "ÓõíèÝôçò:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôü ôï üíïìá óõíèÝôç"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Áñ÷éêüò êáëëéôÝ÷íçò:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôü ôï üíïìá áñ÷éêïý "
 "êáëëéôÝ÷íç"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôü ôï copyright"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "Éóôïóåëßäá:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôÞ ôç äéåýèõíóç "
 "éóôïóåëßäáò"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "ÊùäéêïðïéÞèçêå áðü:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr ""
 "ÓõìðëÞñùóç ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí ìå áõôü ôï üíïìá êùäéêïðïéçôÞ"
@@ -1944,229 +1978,239 @@ msgstr ""
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Åéêüíåò"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Åéêüíåò:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Ìðïñåßôå íá ðñïóèÝóåôå åéêüíåò ìå drag & drop."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "×ñÞóç áõôþí ôùí åéêüíùí óå üëá ôá åðéëåãìÝíá áñ÷åßá"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "ÐñïóèÞêç åéêüíùí óôçí åôéêÝôá (ìðïñåß íá ãßíåé êáé ìå drag & drop)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 "Áöáßñåóç ôùí åðéëåãìÝíùí åéêüíùí, Þ üëùí ôùí åéêüíùí áí äåí Ý÷åé åðéëåãåß "
 "êáìßá."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "ÁðïèÞêåõóç ôùí åðéëåãìÝíùí åéêüíùí óôï äßóêï."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Êáèïñéóìüò ôùí éäéïôÞôùí ôùí åðéëåãìÝíùí åéêüíùí."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå ôïí ôßôëï '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "ÁöáéñÝèçêå ï ôßôëïò áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå ôïí êáëëéôÝ÷íç '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr ""
 "ÁöáéñÝèçêå ôï üíïìá êáëëéôÝ÷íç áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå ôïí êáëëéôÝ÷íç '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr ""
+"ÁöáéñÝèçêå ôï üíïìá êáëëéôÝ÷íç áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå ôßôëï äßóêïõ '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "ÁöáéñÝèçêå ï ôßôëïò äßóêïõ áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå áñéèìü äßóêïõ '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "ÁöáéñÝèçêå á/á äßóêïõ áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå ÷ñïíéÜ '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "ÁöáéñÝèçêå ç ÷ñïíéÜ áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå á/á êïììáôéïý ôçò ìïñöÞò "
 "'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå á/á êïììáôéïý ôçò ìïñöÞò "
 "'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "ÁöáéñÝèçêå ï á/á êïììáôéïý áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Ôá åðéëåãìÝíá áñ÷åßá áñéèìÞèçêáí äéáäï÷éêÜ."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå åßäïò '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "ÁöáéñÝèçêå ôï åßäïò áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå ó÷üëéï '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "ÁöáéñÝèçêå ôï ó÷üëéï áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå üíïìá óõíèÝôç '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "ÁöáéñÝèçêå ôï üíïìá óõíèÝôç áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
-"Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå üíïìá áñ÷éêïý êáëëéôÝ÷íç '%"
-"s'."
+"Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå üíïìá áñ÷éêïý êáëëéôÝ÷íç "
+"'%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr ""
 "ÁöáéñÝèçêå ôï üíïìá ôïõ áñ÷éêïý êáëëéôÝ÷íç áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí "
 "áñ÷åßùí."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå copyright '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "ÁöáéñÝèçêå ôï copyright áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå éóôïóåëßäá '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "ÁöáéñÝèçêå ç éóôïóåëßäá áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí áñ÷åßùí."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 "Ç åôéêÝôá ôùí åðéëåãìÝíùí áñ÷åßùí óõìðëçñþèçêå ìå üíïìá êùäéêïðïéçôÞ '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr ""
 "ÁöáéñÝèçêå ôï üíïìá ôïõ êùäéêïðïéçôÞ áðü ôéò åôéêÝôåò ôùí åðéëåãìÝíùí "
 "áñ÷åßùí."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "ÐñïóôÝèçêáí åéêüíåò óôçí åôéêÝôá ôïõ åðéëåãìÝíïõ áñ÷åßïõ."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "ÁöáéñÝèçêáí ïé åéêüíåò áðü ôá åðéëåãìÝíá áñ÷åßá."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "ÅðéëÝîôå ôñüðï ëåéôïõñãßáò êáé ìÜóêá êáé åðáíáëÜâáôå ôçí ßäéá åíÝñãåéá"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Óáñþèçêáí üëåò ïé åôéêÝôåò"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "ÁöáéñÝèçêáí üëåò ïé åôéêÝôåò"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "ÁíáæÞôçóç áñ÷åßïõ/ùí"
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Áðïèçêåýôçêáí üëá ôá áñ÷åßá..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Ôá áñ÷åßá äéáãñÜöçêáí åí ìÝñåé..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "ÄéáãñÜöçêáí üëá ôá áñ÷åßá..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2175,16 +2219,16 @@ msgstr ""
 "ÈÝëåôå íá áðïèçêåýóåôå ôçí åôéêÝôá ôïõ áñ÷åßïõ\n"
 "'%s' ;"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "ÁðïèÞêåõóç åôéêÝôáò..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Ìåôïíïìáóßá áñ÷åßïõ êáé êáôáëüãïõ"
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2198,11 +2242,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Ìåôïíïìáóßá êáôáëüãïõ..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2216,11 +2260,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Ìåôïíïìáóßá áñ÷åßïõ"
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2233,17 +2277,17 @@ msgstr ""
 "óå \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "ÁðïèÞêåõóç ôçò åôéêÝôáò ôïõ '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Ïé åôéêÝôåò áðïèçêåýôçêáí"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2252,21 +2296,21 @@ msgstr ""
 "Áäõíáìßá åããñáöÞò ôçò åôéêÝôáò ôïõ áñ÷åßïõ '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Áäõíáìßá åããñáöÞò ôçò åôéêÝôáò ôïõ áñ÷åßïõ '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Ìåôïíïìáóßá áñ÷åßïõ '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2279,7 +2323,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2288,11 +2332,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Ôï/ôá áñ÷åßï/á äåí ìåôïíïìÜóôçêå/áí..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2305,7 +2349,7 @@ msgstr ""
 "äéüôé õðÜñ÷åé ôï áêüëïõèï áñ÷åßï:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2314,7 +2358,7 @@ msgstr ""
 "äéüôé õðÜñ÷åé ôï áêüëïõèï áñ÷åßï:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2325,7 +2369,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2334,16 +2378,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Ôï áñ÷åßï '%s' ìåôïíïìÜóôçêå óå '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Ôï/ôá áñ÷åßï/á ìåôïíïìÜóôçêå/áí"
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2354,7 +2398,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2363,17 +2407,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Ôï áñ÷åßï '%s' ìåôïíïìÜóôçêå óå '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Ôï/ôá áñ÷åßï/á ìåôïíïìÜóôçêå/áí"
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2386,7 +2430,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2395,11 +2439,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Ôï/ôá áñ÷åßï/á äåí ìåôïíïìÜóôçêå/áí..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2408,16 +2452,16 @@ msgstr ""
 "ÈÝëåôå ðñÜãìáôé íá äéáãñÜøåôå ïñéóôéêÜ ôï áñ÷åßï\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "ÄéáãñáöÞ áñ÷åßïõ..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Ôï áñ÷åßï '%s' äéáãñÜöçêå."
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2429,110 +2473,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "ÁíáæÞôçóç óå åîÝëéîç..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Áñ÷åßï: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "ÂñÝèçêáí %d áñ÷åßá óå áõôüí ôïí êáôÜëïãï êáé ôïõò õðïêáôáëüãïõò ôïõ"
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "ÂñÝèçêáí %d áñ÷åßá óå áõôüí ôïí êáôÜëïãï."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u áñ÷åßï/á"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "Äå âñÝèçêå êáíÝíá áñ÷åßï óå áõôüí ôïí êáôÜëïãï êáé ôïõò õðïêáôáëüãïõò ôïõ!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Äå âñÝèçêå êáíÝíá áñ÷åßï óå áõôüí ôïí êáôÜëïãï!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "ÁíáæÞôçóç óå åîÝëéîç..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr " ÓôáìÜôçìá áíáæÞôçóçò..."
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "ÅðéëÝîôå Ýíáí êáôÜëïãï ãéá ðåñéÞãçóç!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "ÓõìðëÞñùóç áõôïý ôïõ ðåäßïõ ôùí åôéêåôþí ôùí åðéëåãìÝíùí áñ÷åßùí"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "ÌåôáôñïðÞ ôïõ '_' êáé ôïõ '%20' óå êåíÜ"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "ÌåôáôñïðÞ ôïõ ' ' óå '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "¼ëá êåöáëáßá"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "¼ëá ðåæÜ"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Ðñþôï ãñÜììá êåöáëáßï"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Ðñþôï ãñÜììá êÜèå ëÝîçò êåöáëáßï"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Áöáßñåóç êåíþí"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "ÅéóáãùãÞ êåíïý ðñéí áðü êÜèå êåöáëáßï ãñÜììá"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Áöáßñåóç äéðëþí êåíþí Þ '_'"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ÁíáðÜíôå÷ç Ýîïäïò! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "ÅëÞöèç ôï óÞìá %s(%d)\n"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2543,11 +2586,11 @@ msgstr ""
 "core' êáé óôç óõíÝ÷åéá 'bt' êáé 'l') êáé ïäçãßåò ãéá ôçí áíáðáñáãùãÞ ôïõ "
 "ðñïâëÞìáôïò óôï <easytag at gmail.com>"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "¶ãíùóôï óÞìá"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2580,11 +2623,11 @@ msgstr ""
 "äéáäñïìÞ_ãéá/áñ÷åßá    ×ñÞóç ó÷åôéêÞò äéáäñïìÞò\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: ÊáíïíéêÞ Ýîïäïò"
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2592,84 +2635,84 @@ msgstr ""
 "ÌåñéêÜ áñ÷åßá Ý÷ïõí ôñïðïðïéçèåß ÷ùñßò íá áðïèçêåõèïýí ïé áëëáãÝò...\n"
 "ÈÝëåôå íá áðïèçêåýóåôå ôéò áëëáãÝò óôá áñ÷åßá ðñïôïý êëåßóåé ôï ðñüãñáììá;"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "Åðéèõìåßôå üíôùò íá åîÝëèåôå áðü ôï ðñüãñáììá;"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ÅôéêÝôá ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "ÅôéêÝôá Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "ÅôéêÝôá FLAC Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "ÅôéêÝôá APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "ÅôéêÝôá MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "Åðüìåíï áñ÷åßï"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "Ðëçñïöïñßåò áñ÷åßïõ MusePack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Åéêüíåò"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2677,14 +2720,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2695,11 +2738,11 @@ msgstr ""
 "óôçí êùäéêïðïßçóç ÷áñáêôÞñùí ôïõ óõóôÞìáôïò\n"
 "(ÄïêéìÜóôå íá èÝóåôå ôç ìåôáâëçôÞ ðåñéâÜëëïíôïò G_FILENAME_ENCODING)"
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "ÌåôÜöñáóç ïíüìáôïò áñ÷åßïõ"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2724,56 +2767,56 @@ msgstr "
 msgid "Channels:"
 msgstr "ÊáíÜëéá:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ÓÖÁËÌÁ êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ:  '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ÓÖÁËÌÁ: Áðïôõ÷ßá áðïèÞêåõóçò ó÷ïëßùí óôï áñ÷åßï '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Ç åôéêÝôá ôïõ '%s' áðïèçêåýôçêå"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "ÁöáéñÝèçêå ç åôéêÝôá ôïõ  '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "ÓöÜëìá êáôÜ ôçí áöáßñåóç ôçò åôéêÝôáò ID3v1 ôïõ '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "ÓöÜëìá êáôÜ ôçí áöáßñåóç ôçò åôéêÝôáò ID3v2 ôïõ '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "ÓöÜëìá êáôÜ ôçí åíçìÝñùóç ôçò åôéêÝôáò ID3v2 ôïõ '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2788,77 +2831,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "ÓöÜëìá êáôÜ ôçí åíçìÝñùóç ôçò åôéêÝôáò ID3v1 ôïõ '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Ç åôéêÝôá ôïõ '%s' åíçìåñþèçêå"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Äåí áíáöÝñèçêå êáíÝíá óöÜëìá"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Äåí õðÜñ÷åé äéáèÝóéìç ìíÞìç"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Äåí õðÜñ÷ïõí äåäïìÝíá ðñïò åðåîåñãáóßá"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "ÁêáôÜëëçëá äéáìïñöùìÝíá äåäïìÝíá"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Äåí õðÜñ÷åé buffer ãéá åããñáöÞ"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Ôï buffer åßíáé ðïëý ìéêñü"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "'Áêõñï frame ID"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Äå âñÝèçêå ôï åðéèõìçôü ðåäßï"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "¶ãíùóôïò ôýðïò ðåäßïõ"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Ç åôéêÝôá áõôÞ áíÞêåé Þäç óå Ýíá áñ÷åßï"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "ÁêáôÜëëçëç Ýêäïóç åôéêÝôáò"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Äåí õðÜñ÷åé áñ÷åßï ðñïò åðåîåñãáóßá"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Áðüðåéñá åããñáöÞò óå áñ÷åßï ðñïóôáôåõìÝíï áðü åããñáöÞ"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "ÓöÜëìá êáôÜ ôç óõìðßåóç/áðïóõìðßåóç"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "¶ãíùóôï ìÞíõìá ëÜèïõò!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2868,7 +2911,7 @@ msgstr ""
 "ðåñéÝ÷åé óöÜëìáôá êáé èá ðñïêáëïýóå áóôÜèåéá óôçí id3lib. Ùò åê ôïýôïõ ôï "
 "ðñüãñáììá äå èá ôï åðåîåñãáóôåß."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "×áëáóìÝíï áñ÷åßï..."
 
@@ -2876,75 +2919,75 @@ msgstr "
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "ÅðéëÝîôå áñ÷åßï..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "ÅðéëÝîôå êáôÜëïãï..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "ÁíáæÞôçóç óå åîÝëéîç..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Äåí åßíáé äõíáôÞ ç åêôÝëåóç ôïõ %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Äçìéïõñãßá ëßóôáò áíáðáñáãùãÞò"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "¼íïìá ëßóôáò áíáðáñáãùãÞò M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "¼íïìá êáôáëüãïõ:"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Åðåîåñãáóßá ìáóêþí"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "ÅðéëïãÝò ëßóôáò áíáðáñáãùãÞò"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Íá ðåñéëáìâÜíåé ìüíï ôá åðéëåãìÝíá áñ÷åßá"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2953,31 +2996,31 @@ msgstr ""
 "ðåñéëçöèïýí óôç ëßóôá áíáðáñáãùãÞò. ÅéäÜëëùò ç ëßóôá èá ðåñéëáìâÜíåé üëá ôá "
 "áñ÷åßá."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "×ñÞóç ðëÞñïõò äéáäñïìÞò ãéá ôá áñ÷åßá óôç ëßóôá áíáðáñáãùãÞò"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "×ñÞóç ó÷åôéêÞò äéáäñïìÞò ãéá ôá áñ÷åßá óôç ëßóôá áíáðáñáãùãÞò"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Äçìéïõñãßá ëßóôáò áíáðáñáãùãÞò óôï ãïíéêü êáôÜëïãï"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Áí åíåñãïðïéçèåß ç åðéëïãÞ áõôÞ, ôüôå ç ëßóôá áíáðáñáãùãÞò èá äçìéïõñãçèåß "
 "óôïí áñ÷éêü êáôÜëïãï."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "×ñÞóç äéá÷ùñéóôéêïý êáôáëüãùí DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2985,23 +3028,23 @@ msgstr ""
 "Ç åðéëïãÞ áõôÞ áíôéêáèéóôÜ ôï äéá÷ùñéóôéêü êáôáëüãùí ôïõ UNIX, '/' ìå ôï "
 "äéá÷ùñéóôéêü ôïõ DOS, '\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Ðåñéå÷üìåíá ëßóôáò áíáðáñáãùãÞò"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "ÁðïèÞêåõóç ìüíï ôçò ëßóôáò ôùí áñ÷åßùí"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "ÁðïèÞêåõóç ðëçñïöïñéþí ìå ÷ñÞóç ôïõ ïíüìáôïò áñ÷åßïõ"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "ÁðïèÞêåõóç ðëçñïöïñéþí ìå ÷ñÞóç:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -3010,12 +3053,12 @@ msgstr ""
 "Ôï áñ÷åßï ëßóôáò áíáðáñáãùãÞò '%s' õðÜñ÷åé Þäç!\n"
 " Íá áíôéêáôáóôáèåß;"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "ÁðïèÞêåõóç ëßóôáò áíáðáñáãùãÞò..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -3024,24 +3067,24 @@ msgstr ""
 "Áäõíáìßá áðïèÞêåõóçò ôçò ëßóôáò áíáðáñáãùãÞò '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Áðïèçêåýôçêå ç ëßóôá áíáðáñáãùãÞò '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "ÊùäéêïðïéÞèçêå áðü"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "ÁíáæÞôçóç óå Ýíá áñ÷åßï"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3049,93 +3092,93 @@ msgstr ""
 "åìöáíéóôïýí üëá ôá áñ÷åßá."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "Óå:"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "ôï ¼íïìá áñ÷åßïõ"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "ç åôéêÝôá ..."
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Ôáßñéáóìá ðåæþí/êåöáëáßùí"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "ÂñÝèçêáí: %d áñ÷åßï/á"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Öüñôùóç ïíïìÜôùí áñ÷åßùí áðü Ýíá áñ÷åßï êåéìÝíïõ"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Áñ÷åßï:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr "Öüñôùóç"
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Åðéâåâáßùóç ìåôïíïìáóßáò ôïõ áñ÷åßïõ"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "ÅéóáãùãÞ åíüò êåíïý ðñéí áðü êÜèå êåöáëáßï ãñÜììá"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò ãñáììÞò"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "ÄéáãñáöÞ üëùí ôùí êåíþí ãñáììþí"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Íá ðåñéëáìâÜíåé ìüíï ôá åðéëåãìÝíá áñ÷åßá"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Íá ðåñéëáìâÜíåé ìüíï ôá åðéëåãìÝíá áñ÷åßá"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Åðáíáöüñôùóç"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "ÁðïèÞêåõóç ìüíï ôçò ëßóôáò ôùí áñ÷åßùí"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "ÅðéëïãÞ üëùí ôùí ãñáììþí"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3144,20 +3187,20 @@ msgstr ""
 "÷ñçóéìïðïéçèåß ï óáñùôÞò ìå ôéò ôñÝ÷ïõóåò ñõèìßóåéò ôïõ (ôï ðáñÜèõñï ôïõ "
 "óáñùôÞ ðñÝðåé íá åßíáé áíïé÷ôü)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "ÅéóáãùãÞ ìßáò êåíÞò ãñáììÞò"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò ãñáììÞò"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Ìåôáêßíçóç ôçò ìÜóêáò ðñïò ôá ðÜíù"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Ìåôáêßíçóç ôçò ìÜóêáò ðñïò ôá êÜôù"
@@ -3238,12 +3281,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ÓÖÁËÌÁ: Áðïôõ÷ßá áíïßãìáôïò ôïõ áñ÷åßïõ '%s' ùò áñ÷åßï vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Ðñïóï÷Þ: Ôï áñ÷åßï Ogg Vorbis  '%s' ðåñéÝ÷åé åôéêÝôá ID3v2."
@@ -3857,7 +3900,7 @@ msgstr ""
 "×ñÞóç ïðùóäÞðïôå ôçò êùäéêïðïßçóçò ÷áñáêôÞñùí ôïõ óõóôÞìáôïò êáé "
 "åíåñãïðïßçóç ôçò ìåôáôñïðÞò ÷áñáêôÞñùí."
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3876,7 +3919,7 @@ msgstr ""
 "×ñÞóç ïðùóäÞðïôå ôçò êùäéêïðïßçóçò ÷áñáêôÞñùí ôïõ óõóôÞìáôïò êáé óéùðçñÞ "
 "áðüññéøç ìåñéêþí ÷áñáêôÞñùí."
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -4037,24 +4080,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Óýíïëï ÷áñáêôÞñùí ãéá ôéò åôéêÝôåò ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Äçìéïõñãßá åôéêÝôáò ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Äçìéïõñãßá åôéêÝôáò ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -4065,12 +4119,12 @@ msgstr ""
 "èá áöáéñåßôáé."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "ÐåñéãñáöÞ:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4079,37 +4133,37 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "ÊùäéêïðïéÞèçêå áðü"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Óýíïëï ÷áñáêôÞñùí ìå ôï ïðïßï èá áðïèçêåýåôáé ç åôéêÝôá óôï áñ÷åßï."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr "¼÷é"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4121,26 +4175,26 @@ msgstr ""
 "óýíïëï áõôü, ôüôå èá áíôéêáôáóôáèåß áí Ýíáí Þ ðåñéóóüôåñïõò üìïéïõò óôçí "
 "åìöÜíéóç ÷áñáêôÞñåò."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ÅôéêÝôá ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Äçìéïõñãßá åôéêÝôáò ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4149,30 +4203,30 @@ msgstr ""
 "ID3v1, Þ, åöüóïí áõôÞ õðÜñ÷åé, èá áíáíåþíåôáé. ÄéáöïñåôéêÜ ç åôéêÝôá ID3v1 "
 "èá áöáéñåßôáé."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Óýíïëï ÷áñáêôÞñùí ìå ôï ïðïßï èá áðïèçêåýåôáé ç åôéêÝôá óôï áñ÷åßï."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Óýíïëï ÷áñáêôÞñùí ãéá ôéò åôéêÝôåò ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4197,7 +4251,7 @@ msgstr ""
 "ôéò åôéêÝôåò ðïõ ãñÜöôçêáí óôá ÅëëçíéêÜ óå Windows Þ ISO-8859-7 ãéá åôéêÝôåò "
 "ðïõ ãñÜöôçêáí óôá ÅëëçíéêÜ óå Unix."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "Óýíïëï ÷áñáêôÞñùí ìå ôï ïðïßï èá ãßíåôáé ç áíÜãíùóç ôçò åôéêÝôáò áðü ôï "
@@ -4206,24 +4260,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "ÓáñùôÞò"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "ÓõìðëÞñùóç åôéêÝôáò - ìåôáôñïðÞ ÷áñáêôÞñùí"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "ÌåôáôñïðÞ ôïõ '_' êáé ôïõ '%20' óå êåíü ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "ÌåôáôñïðÞ ôïõ êåíïý ' ' óå '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4232,11 +4286,11 @@ msgstr ""
 "ìßáò ìÜóêáò óôï óáñùôÞ åôéêåôþí."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Ìåôïíïìáóßá áñ÷åßùí - ìåôáôñïðÞ ÷áñáêôÞñùí"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4245,17 +4299,17 @@ msgstr ""
 "ìßáò ìÜóêáò óôï óáñùôÞ ìåôïíïìáóßáò áñ÷åßùí."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Åðåîåñãáóßá ðåäßùí - ìåôáôñïðÞ ÷áñáêôÞñùí"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Ðåæü ðñþôï ãñÜììá óå ìåñéêÝò ðñïèÝóåéò êáé Üñèñá"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4268,15 +4322,15 @@ msgstr ""
 "¸íá Ðåäßï')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "ÐáñÜèõñï óáñùôÞ"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "¶íïéãìá ôïõ ðáñáèýñïõ óáñùôÞ êáôÜ ôçí åêêßíçóç"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4284,11 +4338,11 @@ msgstr ""
 "ÅíåñãïðïéÞóôå ôçí åðéëïãÞ áõôÞ ãéá íá áíïßãåé áõôüìáôá ôï ðáñÜèõñï ôïõ "
 "óáñùôÞ êÜèå öïñÜ ðïõ îåêéíÜ ôï EasyTAG."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "ÐÜíôá ïñáôü ðáñÜèõñï óáñùôÞ"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4297,16 +4351,16 @@ msgstr ""
 "êýñéï ðáñÜèõñï."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Ðåäßá"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "ÅããñáöÞ ðÜíù áðü ôá õðÜñ÷ïíôá ðåäßá"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4314,11 +4368,11 @@ msgstr ""
 "Áí åíåñãïðïéçèåß, ôüôå ï óáñùôÞò èá áíôéêáèéóôÜ ôï êåßìåíï óôá ðåäßá ðïõ Þäç "
 "Ý÷ïõí åããñáöÞ ìå íÝï. Áí áðåíåñãïðïéçèåß, ôüôå èá ãñÜöåé ìüíï óôá êåíÜ ðåäßá."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Êáèïñéóìüò åñÞìçí ó÷ïëßïõ :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4327,11 +4381,11 @@ msgstr ""
 "óôï ðåäßï «ó÷üëéï» üôáí ÷ñçóéìïðïéåßôå ôï óáñùôÞ ãéá óõìðëÞñùóç ôçò åôéêÝôáò."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "×ñÞóç ôïõ CRC32 ùò åñÞìçí ó÷üëéï (ãéá áñ÷åßá ìå åôéêÝôåò ID3 ìüíï)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4343,46 +4397,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "ÂÜóç ÄåäïìÝíùí CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Áõôüìáôç áíáæÞôçóç"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "¼íïìá :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Èýñá :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "ÄéáäñïìÞ CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Ñõèìßóåéò åîõðçñåôçôÞ"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "ÂÜóç ÄåäïìÝíùí CD"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "ÄéáäñïìÞ CGI :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4391,52 +4445,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Ñõèìßóåéò äéáìåóïëáâçôÞ äéêôýïõ"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "×ñÞóç äéáìåóïëáâçôÞ äéêôýïõ"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Åíåñãïðïßçóç ÷ñÞóçò åíüò äéáìåóïëáâçôÞ äéêôýïõ."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "¼íïìá äéáìåóïëáâçôÞ :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "¼íïìá ôïõ äéáìåóïëáâçôÞ äéêôýïõ"
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Èýñá óýíäåóçò óôï äéáìåóïëáâçôÞ äéêôýïõ"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "¼íïìá ÷ñÞóôç :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "¼íïìá ÷ñÞóôç ãéá ðéóôïðïßçóç óôï äéáìåóïëáâçôÞ äéêôýïõ"
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Óõíèçìáôéêü ÷ñÞóôç :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Óõíèçìáôéêü ÷ñÞóôç ãéá ðéóôïðïßçóç óôï äéáìåóïëáâçôÞ äéêôýïõ"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Ëßóôá Ôßôëùí Êïììáôéþí"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4444,7 +4498,7 @@ msgstr ""
 "ÅðéëïãÞ ôïõ áíôßóôïé÷ïõ áñ÷åßïõ Þ÷ïõ (áíÜëïãá ìå ôç èÝóç Þ ôï DLM, áí áõôü "
 "åßíáé åíåñãïðïéçìÝíï)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4454,7 +4508,7 @@ msgstr ""
 "ëßóôá."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4465,15 +4519,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Åðéâåâáéþóåéò"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Åðéâåâáßùóç åîüäïõ áðü ôï ðñüãñáììá"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4481,58 +4535,62 @@ msgstr ""
 "Áí åíåñãïðïéçèåß, ôüôå èá æçôåßôáé áðü ôï ÷ñÞóôç åðéâåâáßùóç åîüäïõ áðü ôï "
 "ðñüãñáììá."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Åðéâåâáßùóç áðïèÞêåõóçò ôçò åôéêÝôáò ôïõ áñ÷åßïõ"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Åðéâåâáßùóç ìåôïíïìáóßáò ôïõ áñ÷åßïõ"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Åðéâåâáßùóç äéáãñáöÞò ôïõ áñ÷åßïõ"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Åðéâåâáßùóç áðïèÞêåõóçò ôçò ëßóôáò áíáðáñáãùãÞò"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr ""
 "ÅöáñìïãÞ ôùí áëëáãþí (÷ùñßò áðïèÞêåõóÞ ôïõò) êáé êëåßóéìï ôïõ ðáñáèýñïõ"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Êëåßóéìï ôïõ ðáñáèýñïõ ÷ùñßò íá áðïèçêåõôïýí ïé áëëáãÝò"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "ÁðïèÞêåõóç ôùí áëëáãþí êáé êëåßóéìï ôïõ ðáñáèýñïõ"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Ð.÷.: %.*d_-_¼íïìá_áñ÷åßïõ_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Ïé áëëáãÝò ôÝèçêáí óå éó÷ý"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Ïé ñõèìßóåéò áðïèçêåýôçêáí"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Ïé ñõèìßóåéò Ýìåéíáí áìåôÜâëçôåò"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4543,57 +4601,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Äåí åßíáé êáôÜëïãïò"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Ôï ðñüãñáììá áíáðáñáãùãÞò Þ÷ïõ '%s' äå âñÝèçêå!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "ÓõìðëÞñùóç åôéêÝôáò"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Ìåôïíïìáóßá áñ÷åßïõ êáé êáôáëüãïõ"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Åðåîåñãáóßá ðåäßùí"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Ç åôéêÝôá óõìðëçñþèçêå åðéôõ÷þò..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Ç åôéêÝôá óõìðëçñþèçêå åðéôõ÷þò...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "ÓöÜëìá óÜñùóçò: áäõíáìßá åíôïðéóìïý ôïõ äéá÷ùñéóôéêïý '%s' óôï '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Áäõíáìßá ìåôáôñïðÞò ôïõ '%s' óôï óýíïëï ÷áñáêôÞñùí ôïõ óõóôÞìáôïò."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Ôï áñ÷åßï ìåôïíïìÜóôçêå ìå åðéôõ÷ßá..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Ôï áñ÷åßï ìåôïíïìÜóôçêå ìå åðéôõ÷ßá...(%s)"
@@ -4601,41 +4659,41 @@ msgstr "
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "ÓÜñùóç åôéêÝôáò êáé ïíüìáôïò áñ÷åßïõ."
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "ÅíÝñãåéá :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "ÅðéëÝîôå ôïí ôýðï óáñùôÞ ðïõ åðéèõìåßôå"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "ÓÜñùóç ôùí åðéëåãìÝíùí áñ÷åßùí"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "ÅðéëïãÝò óáñùôÞ"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "ÅìöÜíéóç / Áðüêñõøç ôïõ äéïñèùôÞ ìáóêþí"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "ÅìöÜíéóç / Áðüêñõøç õðïìíÞìáôïò"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Êëåßóéìï ôïõ ðáñáèýñïõ áõôïý"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4645,15 +4703,15 @@ msgstr ""
 "×ñçóéìïðïéåßôáé ãéá ôç óõìðëÞñùóç ôçò åôéêÝôáò."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Ðñïåðéóêüðçóç åôéêÝôáò..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "×ñÞóç ôçò ôñÝ÷ïõóáò äéáäñïìÞò ùò ðñüèåìá óôç ìÜóêá"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4668,15 +4726,15 @@ msgstr ""
 "ôçí ðñïçãïýìåíç äéáäñïìÞ."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Ðñïåðéóêüðçóç ïíüìáôïò áñ÷åßïõ..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "ÅðéëÝîôå ðåäßá:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4685,126 +4743,136 @@ msgstr ""
 "áõôÜ ðïõ óáò åíäéáöÝñïõí."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "Á"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "¼íïìá áñ÷åßïõ"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "Ô"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Ôßôëïò êïììáôéïý"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ê"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "ÊáëëéôÝ÷íçò"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "ÊáëëéôÝ÷íçò"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Ä"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "¼íïìá äßóêïõ"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "Å"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Ìïõóéêü åßäïò"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Ó÷"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Ó÷üëéï"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Óõ"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "¼íïìá óõíèÝôç"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "Áñ"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "¼íïìá áñ÷éêïý êáëëéôÝ÷íç"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "C"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "Êù"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "ÊùäéêïðïéÞèçêå áðü"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "ÁíôéóôñïöÞ åðéëïãÞò"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "ÅðéëïãÞ/áðïåðéëïãÞ üëùí"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "ÌåôáôñïðÞ ôïõ '_' êáé ôïõ '%20' óå ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "ÌåôáôñïðÞ :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "óå : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4812,7 +4880,7 @@ msgstr ""
 "Ç êÜôù ðáýëá êáé ç óõìâïëïóåéñÜ '%20' áíôéêáèéóôþíôáé áðü Ýíá êåíü. Ð.÷. ôï "
 "'Êåßìåíï%20óå%20ïðïéïäÞðïôå_ðåäßï' ãßíåôáé 'Êåßìåíï óå ïðïéïäÞðïôå_ðåäßï'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4820,16 +4888,16 @@ msgstr ""
 "Ôï êåíü áíôéêáèßóôáôáé áðü ìßá êÜôù ðáýëá. Ð.÷. ôï 'Êåßìåíï óå ïðïéïäÞðïôå "
 "ðåäßï' ãßíåôáé 'Êåßìåíï_óå_ïðïéïäÞðïôå_ðåäßï'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4837,7 +4905,7 @@ msgstr ""
 "ÌåôáôñïðÞ üëùí ôùí ãñáììÜôùí óå üëá ôá ðåäßá óå êåöáëáßá. Ð.÷. ôï 'Êåßìåíï "
 "óå êÜðïéï ÐÅÄÉÏ' ãßíåôáé 'ÊÅÉÌÅÍÏ ÓÅ ÊÁÐÏÉÏ ÐÅÄÉÏ'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4845,7 +4913,7 @@ msgstr ""
 "ÌåôáôñïðÞ üëùí ôùí ãñáììÜôùí óå üëá ôá ðåäßá óå ðåæÜ. Ð.÷. ôï 'Êåßìåíï óå "
 "êÜðïéï ÐÅÄÉÏ' ãßíåôáé 'êåßìåíï óå êÜðïéï ðåäßï'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4853,7 +4921,7 @@ msgstr ""
 "ÌåôáôñïðÞ ôïõ áñ÷éêïý ãñÜììáôïò ôçò ðñþôçò ëÝîçò êÜèå ðåäßïõ óå êåöáëáßï. Ð."
 "÷. ôï 'êåßìåíï ÓÅ ÊÜðïéï ÐÅäßï' ãßíåôáé 'Êåßìåíï óå êÜðïéï ðåäßï'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4861,7 +4929,7 @@ msgstr ""
 "ÌåôáôñïðÞ ôïõ áñ÷éêïý ãñÜììáôïò êÜèå ëÝîçò êÜèå ðåäßïõ óå êåöáëáßï. Ð.÷. ôï "
 "'êåßìåíï ÓÅ ÊÁðïéï Ðåäßï' ãßíåôáé 'Êåßìåíï Óå ÊÜðïéï Ðåäßï'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4870,15 +4938,15 @@ msgstr ""
 "ÅéóÜãåôáé Ýíá êåíü ðñéí áðü êÜèå êåöáëáßï ÷áñáêôÞñá. Ð.÷. ôï "
 "'ÊåßìåíïÓåÊÜðïéïÐåäßï' ãßíåôáé 'Êåßìåíï Óå ÊÜðïéï Ðåäßï'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "ÅéóáãùãÞ åíüò êåíïý ðñéí áðü êÜèå êåöáëáßï ãñÜììá"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Áöáßñåóç äéðëþí êåíþí Þ êÜôù ðáõëþí"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4886,7 +4954,7 @@ msgstr ""
 "Áöáéñïýíôáé üëá ôá êåíÜ áíÜìåóá óôéò ëÝîåéò. Ð.÷. ôï 'Êåßìåíï Óå ÊÜðïéï "
 "Ðåäßï' ãßíåôáé 'ÊåßìåíïÓåÊÜðïéïÐåäßï'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4894,7 +4962,7 @@ msgstr ""
 "ÅéóÜãåôáé Ýíá êåíü ðñéí áðü êÜèå êåöáëáßï ÷áñáêôÞñá. Ð.÷. ôï "
 "'ÊåßìåíïÓåÊÜðïéïÐåäßï' ãßíåôáé 'Êåßìåíï Óå ÊÜðïéï Ðåäßï'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4905,161 +4973,166 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Õðüìíçìá"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : ¼íïìá êáëëéôÝ÷íç"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : ¼íïìá êáëëéôÝ÷íç"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : Ôßôëïò äßóêïõ"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : Ó÷üëéï"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : ¼íïìá óõíèÝôç"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : Copyright"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : á/á äßóêïõ"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : ÊùäéêïðïéÞèçêå áðü"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : Ìïõóéêü åßäïò"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : Íá áãíïçèåß"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : Áñéèìüò êïììáôéþí"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ¼íïìá áñ÷éêïý êáëëéôÝ÷íç"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n Áñéèìüò êïììáôéïý"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : Ôßôëïò"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : ×ñïíéÜ"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "ÄéïñèùôÞò ÌÜóêáò"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Äçìéïõñãßá íÝáò ìÜóêáò"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Ìåôáêßíçóç ôçò ìÜóêáò ðñïò ôá ðÜíù"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Ìåôáêßíçóç ôçò ìÜóêáò ðñïò ôá êÜôù"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Äéðëáóéáóìüò ôçò ìÜóêáò"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "ÐñïóèÞêç åî ïñéóìïý ìáóêþí"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "ÄéáãñáöÞ ìÜóêáò"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "ÁðïèÞêåõóç ìáóêþí"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "_ÍÝá ìÜóêá"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "ÁíôéãñáöÞ: Äåí Ý÷åé åðéëåãåß êáìßá óåéñÜ!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "ÄéáãñáöÞ: Äåí Ý÷åé åðéëåãåß êáìßá óåéñÜ!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Ìåôáêßíçóç ðñïò ôá ðÜíù: Äåí Ý÷åé åðéëåãåß êáìßá óåéñÜ!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Ìåôáêßíçóç ðñïò ôá êÜôù: Äåí Ý÷åé åðéëåãåß êáìßá óåéñÜ!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "ÓÖÁËÌÁ: Áäõíáìßá áðïèÞêåõóçò ôïõ áñ÷åßïõ ñõèìßóåùí %s (%s)\n"
 "\a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Áäõíáìßá áíïßãìáôïò ôïõ áñ÷åßïõ ñõèìßóåùí  '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Öüñôùóç åñÞìçí ñõèìßóåùí..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Áäõíáìßá äçìéïõñãßáò Þ áíïßãìáôïò ôïõ áñ÷åßïõ '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -5067,28 +5140,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Öüñôùóç ôùí ðñïêáèïñéóìÝíùí ìáóêþí óõìðëÞñùóçò åôéêÝôáò..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Öüñôùóç ôùí ðñïêáèïñéóìÝíùí ìáóêþí ìåôïíïìáóßáò áñ÷åßïõ..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Öüñôùóç ôùí ðñïêáèïñéóìÝíùí ìáóêþí ìåôïíïìáóßáò êáôáëüãïõ..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "ÓÖÁËÌÁ: Äåí Ý÷åé ïñéóôåß ç ìåôáâëçôÞ ðåñéâÜëëïíôïò HOME!\n"
 "\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ÓÖÁËÌÁ: Áäõíáìßá äçìéïõñãßáò ôïõ êáôáëüãïõ  '%s' (%s)!"
@@ -5285,8 +5358,8 @@ msgstr "
 
 #~ msgid "Always save tags to ISO-8859-1 character set"
 #~ msgstr ""
-#~ "ÁðïèÞêåõóç ôùí åôéêåôþí ÷ñçóéìïðïéþíôáò ôçí êùäéêïðïßçóç ÷áñáêôÞñùí ISO-"
-#~ "8859-1"
+#~ "ÁðïèÞêåõóç ôùí åôéêåôþí ÷ñçóéìïðïéþíôáò ôçí êùäéêïðïßçóç ÷áñáêôÞñùí "
+#~ "ISO-8859-1"
 
 #~ msgid ""
 #~ "Use the ISO-8859-1 character set (single byte character set) to write the "
@@ -5328,8 +5401,8 @@ msgstr "
 #~ "÷ñçóéìïðïéçèåß ìüíï óå åôéêÝôåò ID3v2. Ïé åôéêÝôåò ID3v1 ÷ñçóéìïðïéïýí "
 #~ "ìüíï óýíïëá ÷áñáêôÞñùí ôïõ åíüò byte (ôõðéêÜ ISO-8859-1).\n"
 #~ "\n"
-#~ "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå Ýíá óýíïëï ÷áñáêôÞñùí äéáöïñåôéêü áðü ôï ISO-"
-#~ "8859-1, ÷ñçóéìïðïéþíôáò ôçí åðéëïãÞ '×ñÞóç ìç-ôõðïðïéçìÝíïõ óõíüëïõ "
+#~ "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå Ýíá óýíïëï ÷áñáêôÞñùí äéáöïñåôéêü áðü ôï "
+#~ "ISO-8859-1, ÷ñçóéìïðïéþíôáò ôçí åðéëïãÞ '×ñÞóç ìç-ôõðïðïéçìÝíïõ óõíüëïõ "
 #~ "÷áñáêôÞñùí ãéá ôçí áðïèÞêåõóç ôùí åôéêåôþí ID3'.\n"
 #~ "Åðßóçò ìðïñåßôå íá ïñßóåôå ìåñéêïýò êáíüíåò ðïõ èá åöáñìüæïíôáé óå "
 #~ "ðåñéðôþóåéò ðïõ êÜðïéïé ÷áñáêôÞñåò äåí õðÜñ÷ïõí óôï óõãêåêñéìÝíï óýíïëï "
@@ -5378,8 +5451,8 @@ msgstr "
 #~ "For ISO-8859-1 fields, apply also these rules if some characters can't be "
 #~ "converted when writing tags:"
 #~ msgstr ""
-#~ "ÅöáñìïãÞ ôùí ðáñáêÜôù êáíüíùí ãéá ôá ðåäßá ðïõ áðïèçêåýïíôáé óå ISO-8859-"
-#~ "1, üôáí ìåñéêïß ÷áñáêôÞñåò äåí ìðïñïýí íá ìåôáôñáðïýí:"
+#~ "ÅöáñìïãÞ ôùí ðáñáêÜôù êáíüíùí ãéá ôá ðåäßá ðïõ áðïèçêåýïíôáé óå "
+#~ "ISO-8859-1, üôáí ìåñéêïß ÷áñáêôÞñåò äåí ìðïñïýí íá ìåôáôñáðïýí:"
 
 #~ msgid "Do nothing"
 #~ msgstr "Êáìßá åíÝñãåéá"
diff --git a/po/es.gmo b/po/es.gmo
index 21963f2..9a7e86c 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 00ae3fb..dc8534d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2005-12-22 02:16+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador at tecknolabs.com>\n"
 "Language-Team:  <traductores at es.gnome.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,6 +30,7 @@ msgstr ""
 "Linux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Traducción alemana)"
 
@@ -112,111 +114,111 @@ msgstr "(Traducción griega)"
 msgid "(Serbian translation)"
 msgstr "(Traducción alemana)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Comentario"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Acerca de..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Acerca de"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilado: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d e id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "Correo-e: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Página web: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Descripción:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "No hay memoria suficiente"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(soporte para archivos Ogg Vorbis deshabilitado)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(soporte para archivos FLAC deshabilitado)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(soporte para archivos MP4/AAC deshabilitado)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
@@ -224,33 +226,33 @@ msgstr "(soporte para archivos MP3 deshabilitado)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Agradecimientos"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Traducciones:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "General:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Cambios"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "No se puede abrir el archivo «%s» (%s)"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ERROR al abrir archivo: «%s» (%s)."
@@ -258,484 +260,494 @@ msgstr "ERROR al abrir archivo: «%s» (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Ordenar la lista por etiqueta"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Ordenar la lista por propiedades"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Ascendente por nombre de archivo"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Descendente por nombre de archivo"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Ascendente por fecha de creación"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Descendente por fecha de creación"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Ascendente por número de pista"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Descendente por número de pista"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Ascendente por título"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Descendente por título"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Ascendente por artista"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Descendente por artista"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Ascendente por artista"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Descendente por artista"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Ascendente por álbum"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Descendente por álbum"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Ascendente por año"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Descendente por año"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Ascendente por género"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Descendente por género"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Ascendente por comentario"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Descendente por comentario"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Ascendente por compositor"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Descendente por compositor"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Ascendente por artista original"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Descendente por artista original"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Ascendente por copyright"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Descendente por copyright"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Ascendente por URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Descendente por URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Ascendente por codificador"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Descendente por codificador"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Ascendente por tipo de archivo"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Descendente por tipo de archivo"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Ascendente por tamaño de archivo"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Descendente por tamaño de archivo"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Ascendente por duración"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Descendente por duración"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Ascendente por tasa de bits"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Descendente por tasa de bits"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Ascendente por tasa de muestreo"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Descendente por tasa de muestreo"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Abrir archivo(s) con ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Seleccionar todos los archivos"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Deseleccionar todos los archivos"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Invertir la selección"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Eliminar archivo(s)..."
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Primer archivo"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Primer archivo"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "_Anterior archivo"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Anterior archivo"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "S_iguiente archivo"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Siguiente archivo"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Último archivo"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Último archivo"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "_Procesar archivo(s)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Procesa los archivo(s)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Eliminar etiqueta(s)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Elimina las etiqueta(s)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Deshacer cambios de los último(s) archivo(s)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Deshace los cambios de los último(s) archivo(s)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Rehacer cambios de los último(s) archivo(s)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Rehace los cambios de los último(s) archivo(s)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Guardar archivo(s)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Guardar archivo(s)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "_Forzar guardado de archivo(s)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Forzar guardado de archivo(s)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Deshacer últimos cambios"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Rehacer últimos cambios"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Salir"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Explorador"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Ir al directorio _personal"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Ir al directorio personal"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Ir al directorio predeterminado"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Ir al directorio personal"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Ir al directorio personal"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Ir al directorio personal"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Ir al directorio _predeterminado"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Ir al directorio predeterminado"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Establecer el directorio _actual como predeterminado"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Establece el directorio actual como predeterminado"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Vista artista-álbum"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Renombrar directorio..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Recargar directorio"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Explorar directorio con..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Contraer árbol"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Refrescar árbol"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "_Procesador"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Rellenar etiqueta(s)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Rellenar etiqueta(s)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Renombrar archivo(s) y directorio..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Renombrar archivo(s) y directorio..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Procesar campo(s)..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Procesar campo(s)..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Varios"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "_Buscar archivo(s)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Buscar archivo(s)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Buscar en CDD_B..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "Buscar en CDDB..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Leer archivos desde TXT..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Escribir lista de reproducción..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Ejecutar reproductor de audio"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Configuración"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Preferencias..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Preferencias..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "A_yuda"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Acerca de"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Parar la acción actual"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Operaciones de archivo"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Buscar archivo(s) en CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Explorar _subdirectorios"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Mostrar directorios ocultos"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Mostrar explorador del árbol / Mostrar por Artista y Álbum"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "No se pudo combinar el IU, el error fue: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Listo para empezar..."
 
@@ -744,7 +756,7 @@ msgid "New default path for files selected"
 msgstr "Seleccionada la nueva ruta predeterminada para los archivos"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Aceptar..."
 
@@ -756,88 +768,93 @@ msgstr ""
 "Algunos archivos han sido modificados pero no guardados...\n"
 "¿Quiere guardarlos antes de cambiar de directorio?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Álbumes"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Error: Buscando %s, no se pudo encontrar el nodo %s en el árbol."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Árbol"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Nombre de archivo"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Título"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artista"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Álbum"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Año"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Pista"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Género"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Artista original"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Codificado por"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Álbumes"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Archivos"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Ir al directorio superior"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Introducir un directorio para explorar."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Seleccione un directorio para explorar."
@@ -845,33 +862,33 @@ msgstr "Seleccione un directorio para explorar."
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u archivo(s)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artista y Álbum"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Renombrar el directorio"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renombrar el directorio «%s» a : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Usar máscara :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Si está activado, usará máscaras para renombrar el directorio."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -879,31 +896,31 @@ msgstr ""
 "Seleccione o teclee una máscara usando códigos (ver leyenda) para renombrar "
 "el directorio desde los campos de etiquetas."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Máscara para procesar inválida"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Previsualizar el renombrado del directorio..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Error..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "¡Debe introducir un nombre de directorio!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -937,7 +954,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -946,7 +963,7 @@ msgstr ""
 "¡No se puede renombrar puesto que el nombre de directorio ya existe!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -961,89 +978,89 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Directorio renombrado"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Programa a ejecutar :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Introducir el programa a ejecutar. Se le pasará el directorio actual como "
 "parámetro."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Abrir archivo con ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Introducir el programa a ejecutar. Se le pasará el archivo actual como "
 "parámetro."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "¡Debe introducir un nombre de programa!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "No se puede encontrar el programa «%s»"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "No se puede ejecutar «%s» (error %d)\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "¡No se puede crear otro proceso!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando ejecutado : «%s %s»"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Categoría"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Nombre de pista"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Duración"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Búsqueda en CDDB"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Búsqueda automática"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Solicitud a la base de datos FreeDB:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1051,16 +1068,16 @@ msgstr ""
 "Solicitud de consulta automática a la base de datos CDDB usando los archivos "
 "seleccionados (¡el orden es importante!) para generar el CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Parar la búsqueda..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1071,138 +1088,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Búsqueda manual"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Palabras :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Escriba las palabras a buscar (separadas por un espacio o «+»)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Buscar en :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Todos los campos"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Otro"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Todas las categorías"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Clásico"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Varios"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "New Age"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Banda Sonora"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "incluido : funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "películas, shows"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "otros que no se ajustan a las categorías anteriores"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Categorías"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Resultados :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Buscar :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Escriba las palabras a buscar en la siguiente lista"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Buscar siguiente"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Buscar anterior"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Mostrar sólo seleccionados / Mostrar todos"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Deseleccionar todos"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Invertir la selección"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Seleccionar todos"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1215,36 +1232,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Establecer a:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Todo"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Pista #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Pistas"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Ejecutar el procesador para cada archivo"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1259,91 +1276,95 @@ msgstr ""
 "correspondiente, o aplicar los resultados de cddb en vez de usar "
 "directamente el orden de la posición."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Leer las líneas seleccionadas o todas (si ninguna está seleccionada)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Listo para buscar..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Álbum: «%s», artista: «%s», duración: «%s», año: «%s», género: «%s», ID: «%s»"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Invertir la selección"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Ordenar por número de pista"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Ordenar por nombre de pista"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Resolviendo anfitrión  «%s» ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "¡No se puede resolver el anfitrión «%s» (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "¡No se puede crear un nuevo socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Conectando a anfitrión «%s», puerto «%d» ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "¡No se puede conectar al anfitrión «%s» (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectado al anfitrión «%s»"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Error al borrar la etiqueta ID3v1 de «%s» (%s)\n"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "No se puede crear o abrir el archivo «%s» (%s)\n"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "No se puede abrir el archivo «%s» (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Enviando petición ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "¡No se puede enviar la petición (%s)!"
@@ -1352,91 +1373,92 @@ msgstr "¡No se puede enviar la petición (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Obteniendo datos ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "¡El servidor devolvió una respuesta errónea! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "¡El servidor devolvió una respuesta errónea! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Lo siento, la búsqueda web no funciona ahora"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Encontrados %d álbum(s) coincidentes"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "No hay ningún archivo seleccionado"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d archivos seleccionados"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Listo para buscar..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Enviando petición (CddbId: %s, #pistas: %d, Duración total: %d)..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Encontrados %d álbum(s) coincidentes"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "No se puede abrir el archivo «%s» (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Cargando la lista de pistas del álbum ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1449,7 +1471,7 @@ msgstr ""
 "\n"
 "¿Continuar?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Escribir etiqueta según CDDB..."
 
@@ -1638,8 +1660,8 @@ msgstr "Occidental (Windows-1252)"
 #, fuzzy, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
-"El nombre de archivo «%s» no se pudo convertir a la codificación UTF-8 (%"
-"s).\n"
+"El nombre de archivo «%s» no se pudo convertir a la codificación UTF-8 "
+"(%s).\n"
 
 #: src/charset.c:545 src/charset.c:644 src/charset.c:708
 msgid "Invalid UTF-8"
@@ -1657,8 +1679,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
-"El nombre de archivo «%s» no se pudo convertir a la codificación UTF-8 (%"
-"s).\n"
+"El nombre de archivo «%s» no se pudo convertir a la codificación UTF-8 "
+"(%s).\n"
 
 #. Starting messages
 #: src/easytag.c:198
@@ -1714,7 +1736,7 @@ msgstr ""
 msgid "Browser"
 msgstr "Explorador"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Archivo"
 
@@ -1728,11 +1750,11 @@ msgstr "Enlace a archivo roto"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, layer ?"
 
@@ -1740,7 +1762,7 @@ msgstr "?, layer ?"
 msgid "Bitrate:"
 msgstr "Tasa de bits:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1748,17 +1770,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frecuencia:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modo:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1775,7 +1797,7 @@ msgid "Time:"
 msgstr "Duración:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -1804,35 +1826,46 @@ msgstr "Artista:"
 msgid "Tag selected files with this artist"
 msgstr "Etiquetar archivos seleccionados con este artista"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artista:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Etiquetar archivos seleccionados con este artista"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Álbum:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Etiquetar archivos seleccionados con este nombre de álbum"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Etiquetar archivos seleccionados con este número de disco"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Año:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Etiquetar archivos seleccionados con este año"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numerar todas las pistas secuencialmente.  Empieza con 01 en cada "
@@ -1840,11 +1873,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Pista #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1852,287 +1885,296 @@ msgstr ""
 "Poner el número de archivos, en el directorio del mostrado,  a las pistas "
 "seleccionadas"
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiquetar archivos seleccionados con este número de pistas"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Género:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Etiquetar archivos seleccionados con este género"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Etiquetar archivos seleccionados con este comentario"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Etiquetar archivos seleccionados con este compositor"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Artista original:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Etiquetar archivos seleccionados con este artista original"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Etiquetar archivos seleccionados con este copyright"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Etiquetar archivos seleccionados con este URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Etiquetar archivos seleccionados con este codificador"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Imágenes"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Imágenes:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Pues usar arrastrar y soltar para añadir una imagen."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Etiquetar archivos seleccionados con estas imágenes"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Añadir imágenes a la etiqueta (arrastrar y soltar también disponible)"
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Eliminar imágenes seleccionadas, si no todas."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Guardar las imágenes seleccionadas al disco duro."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Ajustar propiedades de las imágenes seleccionadas."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Archivos seleccionados etiquetados con el título «%s»."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Eliminado el título de los archivos seleccionados."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Archivos seleccionados etiquetados con el artista «%s»."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Eliminado el artista de los archivos seleccionados."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Archivos seleccionados etiquetados con el artista «%s»."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Eliminado el artista de los archivos seleccionados."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Archivos seleccionados etiquetados con álbum «%s»."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Eliminado el nombre de álbum de los archivos seleccionados."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Archivos seleccionados etiquetados con el número de disco «%s»."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Eliminó el disco de los archivos seleccionados."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Archivos seleccionados etiquetados con el año «%s»."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Eliminado el año de los archivos seleccionados."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Todos los archivos seleccionados etiquetados con la pista «xx/%s»."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Archivos seleccionados etiquetados con la pista como «xx»."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Eliminado el número de pista de los archivos seleccionados."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Pistas seleccionadas numeradas secuencialmente."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Archivos seleccionados etiquetados con el género «%s»."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Eliminado el género de los archivos seleccionados."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Archivos seleccionados etiquetados con el comentario «%s»."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Eliminado el comentario de los archivos seleccionados."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Archivos seleccionados etiquetados con el compositor «%s»."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Eliminado el compositor de los archivos seleccionados."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Archivos seleccionados etiquetados con el artista original «%s»."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Eliminado el artista original de los archivos seleccionados."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Archivos seleccionados etiquetados con el copyright «%s»."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Eliminado el copyright de los archivos seleccionados."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Archivos seleccionados etiquetados con el URL «%s»."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Eliminado URL de los archivos seleccionados."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Archivos seleccionados etiquetados con el codificador «%s»."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Eliminado el codificador de los archivos seleccionados."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Archivos seleccionados etiquetados con las imágenes."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Eliminadas imágenes de los archivos seleccionados."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Seleccionar Modo y Máscara, y rehacer la misma acción"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Todas las etiquetas han sido procesadas"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Todas las etiquetas han sido eliminadas"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Buscar archivo(s)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Todos los archivos han sido guardados..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Los archivos han sido parcialmente eliminados..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Todos los archivos han sido eliminados..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2141,16 +2183,16 @@ msgstr ""
 "¿Quiere escribir la etiqueta al archivo\n"
 "«%s» ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Escribir etiqueta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Renombrar archivo y directorio..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2164,11 +2206,11 @@ msgstr ""
 "«%s» ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Renombrar directorio..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2182,11 +2224,11 @@ msgstr ""
 "«%s» ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Renombrar archivo..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2199,17 +2241,17 @@ msgstr ""
 "a \n"
 "«%s» ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Escribiendo etiqueta de «%s»"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Etiqueta(s) escritas"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2218,21 +2260,21 @@ msgstr ""
 "No se puede escribir la etiqueta en el archivo «%s»\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "No se puede escribir la etiqueta en el archivo «%s»\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Renombrando archivo «%s»"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2245,7 +2287,7 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2254,11 +2296,11 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Archivo(s) no renombrados..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2271,7 +2313,7 @@ msgstr ""
 "porque el siguiente archivo ya existe:\n"
 "«%s»"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2280,7 +2322,7 @@ msgstr ""
 "porque el siguiente archivo ya existe:\n"
 "«%s»"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2291,7 +2333,7 @@ msgstr ""
 "«%s»\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2300,16 +2342,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Renombrado el archivo «%s» a «%s»"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Archivo(s) renombrados..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2320,7 +2362,7 @@ msgstr ""
 "«%s»\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2329,17 +2371,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Se movió el archivo «%s» a «%s»"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Archivo(s) movidos..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2352,7 +2394,7 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2361,11 +2403,11 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Archivo(s) no movidos..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2374,16 +2416,16 @@ msgstr ""
 "¿Realmente quiere eliminar definitivamente el archivo\n"
 " «%s» ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Eliminar archivo..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Archivo «%s» eliminado"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2395,110 +2437,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Búsqueda en progreso..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Archivo: «%s»"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Encontrados %d archivo(s) en este directorio y los subdirectorios."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Encontrados %d archivo(s) en este directorio"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u archivo(s)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "¡No se han encontrados archivos en este directorio y los subdirectorios!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "¡No se han encontrado archivos en este directorio!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Buscando..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  Parar la búsqueda...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Seleccione un directorio para explorar."
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Etiquetar archivos seleccionados con este campo"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Convertir «_» y «%20» a espacios"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Convertir « » a «_»"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "TODAS MAYÚSCULAS"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "todas minúsculas"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Primera letra mayúscula"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Primera Letra De Cada Palabra Mayúscula"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Borrar espacios"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Insertar espacios antes de una letra en mayúsculas"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Borrar espacios o subrayados duplicados"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ¡Terminación anormal! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Recibida señal %s (%d)\a\n"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2508,11 +2549,11 @@ msgstr ""
 "del error con una traza gdb ('gdb easytag core' y entonces 'bt' y 'l') a "
 "easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Señal desconocida"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2545,11 +2586,11 @@ msgstr ""
 "ruta_a/archivos     Usar una ruta relativa.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Terminación normal."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2557,84 +2598,84 @@ msgstr ""
 "Algunos archivos han sido modificados pero no se han guardado...\n"
 "¿Desea guardarlos antes de salir del programa?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "¿Realmente quiere salir del programa? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "Etiqueta ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Etiqueta Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "Etiqueta FLAC Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "Etiqueta APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etiqueta MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "Archivo MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "Archivo MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Archivo Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "Siguiente archivo"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "Archivo FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "Archivo MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Archivo Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "Archivo MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "Archivo MusePack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Imágenes"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2642,14 +2683,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2660,11 +2701,11 @@ msgstr ""
 "a la codificación del sistema\n"
 "(Intenta configurar la variable de entorno G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Codificación del nombre del archivo"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "El nombre de archivo «%s» excede %d caracteres y será truncado\n"
@@ -2688,56 +2729,56 @@ msgstr "Codificador:"
 msgid "Channels:"
 msgstr "Canales"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ERROR al abrir archivo: «%s» (%s).\n"
 "\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERROR: Fallo al escribir comentarios al archivo «%s» (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Escrita la etiqueta de «%s»"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Borrada la etiqueta de «%s»"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Error al borrar la etiqueta ID3v1 de «%s» (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Error al borrar la etiqueta ID3v2 de «%s» (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Error al actualizar la etiqueta ID3v2 de «%s» (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2752,77 +2793,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Error al actualizar la etiqueta ID3v1 de «%s» (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Actualizada la etiqueta de «%s»"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "No se han producido errores"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "No hay memoria suficiente"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "No hay datos que analizar"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Datos incorrectamente formados"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "No hay búfer para escribir"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "El búfer es demasiado pequeño"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "ID de marco inválido"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Campo pedido no encontrado"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Tipo de campo desconocido"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "La etiqueta ya está asociada a un archivo"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Versión de etiqueta inválida"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Ningún archivo que procesar"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Intentando escribir en un archivo de sólo lectura"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Error en compresión/descompresión"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "¡Mensaje de error desconocido!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2831,7 +2872,7 @@ msgstr ""
 "Debido a que el siguiente archivo corrompido: «%s»\n"
 "causaría un error en id3lib, el programa no lo procesará."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Archivo corrompido..."
 
@@ -2839,75 +2880,75 @@ msgstr "Archivo corrompido..."
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Seleccionar archivo..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Seleccionar directorio..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "Buscando..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "No se puede ejecutar «%s» (%s)\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KiB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MiB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GiB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TiB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Generar una lista de reproducción"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Nombre de la lista M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Usar nombre del directorio"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Editar máscaras"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Opciones de la lista de reproducción"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Incluir sólo los archivos seleccionados"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2915,31 +2956,31 @@ msgstr ""
 "Si está activado, sólo los archivos seleccionados se añadirán a la lista de "
 "reproducción. De lo contrario, se añadirán todos."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Usar ruta completa para los archivos en la lista"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Usar ruta relativa para los archivos en la lista"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Crear lista de reproducción en directorio superior"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Si está seleccionado, la lista de reproducción se creará en el directorio "
 "superior."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Usar el separador de directorio de DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2947,23 +2988,23 @@ msgstr ""
 "Esta opción reemplaza el separador de directorio UNIX «/» por el separador "
 "DOS «\\»."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Contenido de la lista de reproducción"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Escribir sólo la lista de archivos"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Escribir información utilizando el nombre de archivo"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Escribir información usando :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2972,12 +3013,12 @@ msgstr ""
 "El archivo de la lista «%s» ya existe.\n"
 "¿Desea sobreescribirlo?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Escribir lista de reproducción..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2986,24 +3027,24 @@ msgstr ""
 "No se puede escribir el archivo de lista «%s»\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Se ha escrito el archivo de la lista «%s»"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Codificado por"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Buscar un archivo"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3011,93 +3052,93 @@ msgstr ""
 "para mostrar todos los archivos."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "En :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "el Nombre del archivo"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "la etiqueta"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Distinguir capitalización"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Encontrados: %d archivo(s)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Leer nombres de archivo desde un archivo TXT"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Archivo :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Cargar "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Confirmar el renombrado de archivos"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Insertar un espacio antes de una letra mayúscula"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Eliminar esta línea"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Borrar todas las líneas en blanco"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Incluir sólo los archivos seleccionados"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Incluir sólo los archivos seleccionados"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Releer"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Escribir sólo la lista de archivos"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Seleccionar todos"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3105,20 +3146,20 @@ msgstr ""
 "Cuando esta opción esté activa, después de cargar los nombres, el procesador "
 "actual será ejecutado (la ventana del procesador debe estar abierta)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Insertar una línea en blanco"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Eliminar esta línea"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Subir esta máscara"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Bajar esta máscara"
@@ -3199,12 +3240,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERROR: Fallo al abrir archivo: «%s» como vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Atención: el archivo Ogg Vorbis «%s» contiene una etiqueta ID3v2."
@@ -3812,7 +3853,7 @@ msgstr ""
 "Forzar el uso de la codificación de caracteres del sistema y activar la "
 "transliteración"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3830,7 +3871,7 @@ msgstr ""
 "Forzar el uso de la codificación de caracteres del sistema y descartar "
 "silenciosamente algunos caracteres"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3989,24 +4030,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Conjunto de caracteres para las etiquetas ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Escribir etiquetas ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Escribir etiquetas ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -4016,12 +4068,12 @@ msgstr ""
 "principio de los archivos MP3. De otra manera será suprimida."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "Descripción:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4030,22 +4082,22 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Codificado por"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 "Conjunto de caracteres usado para escribir datos de las etiquetas en el "
@@ -4053,16 +4105,16 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr " No "
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4073,26 +4125,26 @@ msgstr ""
 "caracteres destino, puede ser aproximado a través de caracteres de "
 "apariencia similar."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etiqueta ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Escribir etiquetas ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4100,7 +4152,7 @@ msgstr ""
 "Si está seleccionado, una etiqueta ID3v1 será añadida o actualizada al final "
 "de los archivos MP3. De otra manera, será suprimida."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
@@ -4108,24 +4160,24 @@ msgstr ""
 "archivo."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Conjunto de caracteres para las etiquetas ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4147,7 +4199,7 @@ msgstr ""
 "caracteres Windows-1251 para cargar las etiquetas escritas bajo Windows, y "
 "KOI8-R para cargar las etiquetas escritas bajo sistemas Unix."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "Conjunto de caracteres usado para leer los datos de las etiquetas en el "
@@ -4156,24 +4208,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Procesador"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Procesador de etiquetas - Conversión de caracteres"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Convertir caracteres de subrayado «_» y la cadena «%20» a espacios « »"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Convertir espacios « » a subrayados «_»"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4182,11 +4234,11 @@ msgstr ""
 "máscara desde el procesador para etiquetas."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Renombrado de archivos - Conversión de caracteres"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4195,19 +4247,19 @@ msgstr ""
 "máscara."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Procesador de campos - Conversión de caracteres"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "No poner en mayúscula la primera letra de algunas palabras que sean "
 "preposiciones y artículos."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4220,15 +4272,15 @@ msgstr ""
 "'Texto En Una Entrada')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Ventana del procesador"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Abrir la ventana del procesador al arrancar."
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4236,11 +4288,11 @@ msgstr ""
 "Seleccione esta opción para abrir automáticamente la ventana del procesador "
 "cuando EasyTAG comience."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Ventana del procesador siempre encima"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4249,16 +4301,16 @@ msgstr ""
 "siempre sobre la ventana principal."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Campos"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Sobreescribir campos al procesar etiquetas"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4267,11 +4319,11 @@ msgstr ""
 "campos por los nuevos. Si está deseleccionado, sólo los campos en blanco de "
 "las etiquetas serán completadas."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Establecer este texto como comentario predeterminado :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4280,12 +4332,12 @@ msgstr ""
 "comentario al usar el procesador «Rellenar etiqueta»."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Usar CRC32 como comentario predeterminado (sólo para archivos con ID3)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4296,46 +4348,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "Base de datos de CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Búsqueda automática"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Nombre :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Puerto :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "Ruta a CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Opciones del servidor"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Base de datos de CD"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "Ruta a CGI :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4344,52 +4396,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Configuración de proxy"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Usar un proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Activar la configuración del servidor proxy."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Anfitrión:"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Nombre del servidor proxy."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Puerto del servidor proxy."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Usuario:"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Nombre de usuario en el servidor proxy."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Contraseña :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Contraseña en el servidor proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Lista de nombre de pista"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4397,7 +4449,7 @@ msgstr ""
 "Seleccionar el archivo de sonido correspondiente (de acuerdo con posición o "
 "DLM si estuviese activado abajo)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4407,7 +4459,7 @@ msgstr ""
 "seleccionará también."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4418,15 +4470,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Confirmar"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Confirmar la salida del programa"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4434,57 +4486,61 @@ msgstr ""
 "Si está seleccionado, muestra una cuadro de diálogo para confirmar si se "
 "desea salir del programa."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Confirmar la escritura de la etiqueta de archivos"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Confirmar el renombrado de archivos"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Confirmar el borrado de archivos"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Confirmar la escritura de la lista de reproducción"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Aplicar cambios (pero no guardar) y cerrar esta ventana"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Cerrar esta ventana sin guardar"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Guardar cambios y cerrar esta ventana"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Ejemplo : %.*d_-_Pista_nombre_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Cambios aplicados"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Configuración guardada"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Configuración sin cambios"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4495,57 +4551,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "No es un directorio"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "El reproductor del archivo de sonido «%s» no se puede encontrar"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Rellenar etiqueta"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Renombrar archivo y directorio"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Procesar campos"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Se procesaron con éxito las etiquetas..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Se procesaron con éxito las etiquetas...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Error al procesar: no se puede encontrar el separador «%s» entre «%s»"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "No se puede convertir el nombre «%s» a la codificación del sistema."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Nuevo nombre de archivo procesado con éxito..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nuevo nombre de archivo procesado con éxito...(%s)"
@@ -4553,41 +4609,41 @@ msgstr "Nuevo nombre de archivo procesado con éxito...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Procesar etiqueta y nombre de archivo"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Procesador :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Elegir el tipo de procesador a usar"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Abrir ventana del procesador / Procesar archivos seleccionados"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Opciones del procesador"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Mostrar / Ocultar editor de máscaras"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Mostrar / Ocultar leyenda"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4597,15 +4653,15 @@ msgstr ""
 "etiquetas."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Vista previa del relleno de la etiqueta..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Máscara del prefijo con la ruta actual"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4618,15 +4674,15 @@ msgstr ""
 "absoluta, en otro caso, es relativa a la ruta anterior."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Previsualizar el renombrado de archivo..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Elegir campos:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4635,126 +4691,136 @@ msgstr ""
 "Elija aquellos que le interesen."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Procesar el campo de nombre de archivo"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Procesar el campo de título"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Procesar el campo de artista"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Procesar el campo de artista"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Procesar el campo de álbum"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Procesar el campo de género"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Procesar el campo de comentario"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Procesar el campo del compositor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Procesar el campo de artista original"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Procesar el campo de copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Procesar el campo de URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Procesar el campo de codificador"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Seleccionar/Deseleccionar todo."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Convertir '_' y '%20' a ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Convertir :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "a : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4762,7 +4828,7 @@ msgstr ""
 "El carácter de subrayado o la cadena '%20' son reemplazados por un espacio. "
 "Ejemplo, antes: 'Texto%20En%20Una_Entrada', después: 'Texto En Una Entrada'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4770,16 +4836,16 @@ msgstr ""
 "El carácter de espacio es reemplazado por un carácter de subrayado. Ejemplo, "
 "antes: 'Texto En Una Entrada', después: 'Texto_En_Una_Entrada'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4787,7 +4853,7 @@ msgstr ""
 "Convertir todas las palabras en todos los campos a mayúsculas. Ejemplo, "
 "antes: 'Texto EN UNA entrada', después: 'TEXTO EN UNA ENTRADA'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4795,7 +4861,7 @@ msgstr ""
 "Convertir todas las palabras de todos los campos a minúsculas. Ejemplo, "
 "antes: 'TEXTO EN una entrada', después: 'texto en una entrada'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4803,7 +4869,7 @@ msgstr ""
 "Convertir la inicial de la primera palabra en todos los campos a mayúsculas. "
 "Ejemplo, antes: 'texto EN Una ENTRADA', después: 'Texto en una entrada'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4811,7 +4877,7 @@ msgstr ""
 "Convertir la inicial de cada palabra en todos los campos a mayúsculas. "
 "Ejemplo, antes: 'Texto en una ENTRADA', después: 'Texto En Una Entrada'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4820,15 +4886,15 @@ msgstr ""
 "Se inserta un espacio antes de cada letra mayúscula. Ejemplo, antes: "
 "'TextoEnUnaEntrada', después: 'Texto En Una Entrada'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Insertar un espacio antes de una letra mayúscula"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Borrar espacios o subrayados duplicados"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4836,7 +4902,7 @@ msgstr ""
 "Todos los espacios entre palabras son borrados. Ejemplo, antes: 'Texto En "
 "Una Entrada', después: 'TextoEnUnaEntrada'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4844,7 +4910,7 @@ msgstr ""
 "Se inserta un espacio antes de cada letra mayúscula. Ejemplo, antes: "
 "'TextoEnUnaEntrada', después: 'Texto En Una Entrada'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4855,161 +4921,166 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Leyenda"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artista"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : artista"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : álbum"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : comentario"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositor"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r: copyright"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : número de disco"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : codificado por"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : género"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorado"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : número de pistas"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artista orig."
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : pista"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : título"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : año"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Editor de máscaras"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Crear nueva máscara"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Subir esta máscara"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Bajar esta máscara"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Duplicar máscara"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Añadir máscara predeterminada"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Borrar máscara"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Guardar máscaras"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nueva_máscara"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Copiar: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Borrar: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Subir: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Bajar: ¡ninguna fila seleccionada!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "ERROR: No se puede escribir el archivo de configuración: %s (%s)\n"
 "\a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "No se puede abrir el archivo de configuración «%s» (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Cargando la configuración predeterminada..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "No se puede crear o abrir el archivo «%s» (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -5017,28 +5088,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Cargando máscaras de «Rellenar etiqueta» predefinidas..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Cargando máscaras de 'Renombrar archivo' predefinidas..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Cargar las máscaras de 'Renombrar directorio' predefinidas..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "ERROR: ¡La variable de entorno HOME no está definida!\n"
 "\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERROR: ¡No se puede crear el directorio «%s» (%s)!"
@@ -5275,8 +5346,8 @@ msgstr "Ejecutar reproductor de audio"
 #~ msgstr ""
 #~ "El conjunto de caracteres UNICODE se usará si la conversión a ISO-8859-1 "
 #~ "falla. Unicode puede usarse para ID3v2 pero no para etiquetas ID3v1 que "
-#~ "sólo usan un conjunto de caracteres de un solo byte. (por omisión ISO-"
-#~ "8859-1).\n"
+#~ "sólo usan un conjunto de caracteres de un solo byte. (por omisión "
+#~ "ISO-8859-1).\n"
 #~ "\n"
 #~ "Si se selecciona un conjunto de caracteres diferente con «Usar un "
 #~ "conjunto de caracteres no estándar para escribir etiquetas ID3, se usará "
diff --git a/po/fr.gmo b/po/fr.gmo
index 3574bb2..f5424d2 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 1b909f3..d675ec0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2008-07-12 10:41+0100\n"
 "Last-Translator: Jerome Couderc <easytag at gmail.com>\n"
 "Language-Team: French <fr at li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,6 +30,7 @@ msgstr ""
 "Linux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(traduction Allemande)"
 
@@ -108,137 +110,137 @@ msgstr "(traduction H
 msgid "(Serbian translation)"
 msgstr "(traduction Serbe)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "Nom de l'extension"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "Statut"
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Comment."
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "A Propos..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "A Propos"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilé le: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(utilisé: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Auteur : %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail : %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Page Web : "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Description :"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "Support des fichiers MP3"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "activé"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "désactivé"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "Support des tags ID3v2.3"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "disponible"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Support des fichiers Ogg Vorbis"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Support des fichiers Speex"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "Support des fichiers FLAC"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "Support des fichiers MP4/AAC"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "Support des fichiers WavPack"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Remerciements"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Traductions :\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Général :\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Historique"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Impossible d'ouvrir le fichier '%s' (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ERREUR lors de l'ouverture du fichier: '%s' (%s)."
@@ -246,480 +248,490 @@ msgstr "ERREUR lors de l'ouverture du fichier: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Classer liste par tag"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Classer liste par propriétés"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Ordre croissant des noms de fichiers"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Ordre décroissant des noms de fichiers"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Ordre croissant des dates de création"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Ordre décroissant des dates de création"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Ordre croissant des pistes"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Ordre décroissant des pistes"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Ordre croissant des titres"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Ordre décroissant des titres"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Ordre croissant des artistes"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Ordre décroissant des artistes"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Ordre croissant des artistes"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Ordre décroissant des artistes"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Ordre croissant des albums"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Ordre décroissant des albums"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Ordre croissant des années"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Ordre décroissant des années"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Ordre croissant des genres"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Ordre décroissant des genres"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Ordre croissant des commentaires"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Ordre décroissant des commentaires"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Ordre croissant des compositeurs"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Ordre décroissant des compositeurs"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Ordre croissant des artistes originaux"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Ordre décroissant des artistes originaux"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Ordre croissant des copyrights"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Ordre décroissant des copyrights"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Ordre croissant des URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Ordre décroissant des URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Ordre croissant des noms d'encodeur"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Ordre décroissant des noms d'encodeur"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Ordre croissant des types de fichiers"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Ordre décroissant des types de fichiers"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Ordre croissant de taille des fichiers"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Ordre décroissant de taille des fichiers"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Ordre croissant des durées"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Ordre décroissant des durées"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Ordre croissant des débits"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Ordre décroissant des débits"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Ordre croissant des fréquences"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Ordre décroissant des fréquences"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Ouvrir le(s) Fichier(s) avec ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Sélectionner tous les Fichiers"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Désélectionner tous les Fichiers"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Inverser la Sélection des Fichiers"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Effacer le(s) Fichier(s) ..."
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "Premier _Fichier"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Premier Fichier"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Fichier _Précédent"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Fichier Précédent"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "Fichier Suivant"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Fichier Suivant"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "Dernier Fichier"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Dernier Fichier"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "S_canner le(s) Fichier(s)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Scanner le(s) Fichier(s)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "Effacer le(s) Tag(s)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Effacer le(s) Tag(s)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "Ann_uler Modifs des Fichier(s)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Annuler Modifs des Fichier(s)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "R_efaire Modifs des Fichier(s)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Refaire Modifs des Fichier(s)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Sauver le(s) Fichier(s)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Sauver le(s) Fichier(s)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "_Forcer la Sauvegarde de(s) Fichier(s)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Forcer la Sauvegarde de(s) Fichier(s)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Annuler les Derniers Changements"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Refaire les Derniers Changements"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "Sélec_teur"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Aller dans le dossier Personnel"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Aller dans le dossier Personnel"
 
-#: src/bar.c:211
+#: src/bar.c:215
 msgid "Go to Desktop Directory"
 msgstr "Aller dans le dossier du Bureau"
 
-#: src/bar.c:212
+#: src/bar.c:216
 msgid "Go to Documents Directory"
 msgstr "Aller dans le dossier Documents"
 
-#: src/bar.c:213
+#: src/bar.c:217
 msgid "Go to Downloads Directory"
 msgstr "Aller dans le dossier Téléchargements"
 
-#: src/bar.c:214
+#: src/bar.c:218
 msgid "Go to Music Directory"
 msgstr "Aller dans le dossier Musiques"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Aller dans le Répertoire par _Défaut"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Aller dans le Répertoire par Défaut"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Mettre le Chemin _Courant par Défaut"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Mettre le Chemin Courant par Défaut"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Arborescence | Vue par Artiste-Album"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Renommer le Répertoire ..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Recharger le Répertoire"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Parcourir le Répertoire avec ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "Refermer l'Arborescence"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Rafraîchir l'Arborescence"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "S_canner"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Compléter le(s) Tag(s) ..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Compléter le(s) Tag(s) ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Renommer le(s) Fichier(s) et Répertoire(s) ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Renommer le(s) Fichier(s) et Répertoire(s) ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Traiter les Champs ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Traiter les Champs ..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Divers"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Rechercher le(s) _fichier(s) ..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Rechercher le(s) fichier(s) ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Recherche CDD_B ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "Recherche CDDB ..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Charger les Noms des fichiers à partir d'un TXT ..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Ecrire Liste de Lecture ..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Lancer Lecteur Audio"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "Paramètre_s"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Préférences ..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Préférences ..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_A Propos"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Arrêter l'action courante"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "Opérations sur _Fichier"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Rechercher le(s) fichier(s) avec CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Effacer le journal"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Parcourir les _Sous-répertoires"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Afficher les répertoires cachés"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Afficher l'arborescence / Afficher par Album et Artiste"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Impossible de fusionner l'UI, erreur: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Prêt à  démarrer"
 
@@ -728,7 +740,7 @@ msgid "New default path for files selected"
 msgstr "Un nouveau chemin par défaut a été sélectionné"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Confirmer..."
 
@@ -740,119 +752,124 @@ msgstr ""
 "Des fichiers ont été modifiés mais pas sauvés...\n"
 "Voulez-vous les sauver avant de changer de répertoire?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Tous les albums>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 "Erreur: Recherche de %s, impossible de trouver le noeud %s dans l'arbre."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Arborescence"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Nom de Fichier"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Titre"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artiste"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Année"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Piste"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Genre"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Compositeur"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Artiste Orig."
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 msgid "Encoded By"
 msgstr "Encodeur"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Albums"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Fichiers"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Aller dans le Répertoire Parent"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Entrer un répertoire à parcourir."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 msgid "Select a directory to browse."
 msgstr "Séléctionner un répertoire à parcourir."
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 msgid "... file(s)"
 msgstr "... fichier(s)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artiste & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Renommer le Répertoire"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renommer le répertoire '%s' en :"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Utiliser le masque :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Si activé, les masques seront utilisés pour renommer le répertoire."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -860,31 +877,31 @@ msgstr ""
 "Sélectionner ou taper un masque en utilisant les codes (voir la légende dans "
 "la fenêtre du scanner) pour renommer le répertoire d'après les champs du tag."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Masque de Scanner Invalide"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Apercu du renommeur de répertoires..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Erreur..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Vous devez saisir un nom de répertoire!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -919,7 +936,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -928,7 +945,7 @@ msgstr ""
 "Impossible de renommer car ce répertoire existe déjà !\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -943,86 +960,86 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Répertoire renommé"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Programme à  lancer :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Entrez le programme à lancer. Il recevra en paramètre le répertoire courant."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Ouvrir le Fichier avec ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Entrez le programme à lancer. Il recevra en paramètre le fichier courant."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Vous devez saisir un nom de programme!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Le programme '%s' n'a pas été trouvé!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Impossible d'exécuter %s (erreur %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Ne peut lancer un processus fils!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Commande exécutée : '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artiste / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Catégorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Nom de Piste"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Durée"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Recherche Base de Données CD"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Recherche Automatique"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "Interroger la base de CD :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1030,16 +1047,16 @@ msgstr ""
 "Interroger automatiquement la base CDDB à partir des fichiers sélectionnés "
 "pour générer le CddbID (l'ordre des fichiers est important!)"
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Arrêter la recherche ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Utiliser Cddb local"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1050,139 +1067,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr " Recherche Manuelle"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Mots :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Entrez les mots à rechercher (séparés par un espace ou un '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Rechercher dans :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Tous les Champs"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Autres"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Toutes les Catégories"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Classique"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Divers"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclus : funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "films, shows"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "tous ceux qui ne correspondent pas aux autres catégories"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Catégories "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Résultats :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Rechercher :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Entrez les mots à rechercher dans la liste du dessous"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr " Rechercher le suivant"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Rechercher le précédent"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Afficher seulement les lignes rouges (ou afficher toutes les lignes) dans la "
 "liste 'Artiste / Album'"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Désélectionner toutes les lignes"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Inverser la sélection des lignes"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Sélectionner toutes les lignes"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1196,36 +1213,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Mettre dans :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Tous"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "N° Piste"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "Nbr Pistes"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Exécuter le scanner courant pour chaque fichier"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Correspondance des lignes avec DLM"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1239,93 +1256,97 @@ msgstr ""
 "sera utilisé pour sélectionner le fichier audio correspondant, ou lors du "
 "chargement des résultats CDDB au lieu de se baser sur la position."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Charger les lignes sélectionnées ou toutes les lignes (si aucune n'est "
 "sélectionnée)"
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Prêt à chercher..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Album: '%s', artiste: '%s', durée: '%s', année: '%s', genre: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Classer par Numéro de Piste"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Classer par Nom de Piste"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Obtention de l'hôte '%s' ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Impossible d'obtenir l'hôte '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "ERREUR: Impossible de créer un nouveau socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Connexion en cours sur l'hôte '%s' (port '%d') ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Impossible de se connecter sur l'hôte '%s' (%s)"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Connecté sur l'hôte '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Réception des données (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Erreur lors de la lecture de la réponse cddb (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Impossible de créer le fichier '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Impossible d'ouvrir le fichier '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Envoi de la requête ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Impossible d'envoyer la requête (%s)!"
@@ -1334,62 +1355,63 @@ msgstr "Impossible d'envoyer la requ
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Réception des données ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Le serveur a retourné une mauvaise réponse!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Le serveur a retourné une mauvaise réponse! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Désolé, mais la recherche web est désactivée pour l'instant"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Trouvé(s) %d album(s) correspondant(s)"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Réception des données de la page %d (album %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Réception des données de la page %d ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "D'autres résultats à charger ..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Aucun fichier sélectionné!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Plus de 99 fichiers sélectionnés! Impossible d'envoyer la requête!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fichier(s) sélectionné(s)!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Recherche CD locale ..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
@@ -1397,28 +1419,28 @@ msgstr ""
 "Le répertoire pour la 'Base de CD locale' n'a pas été définie!\n"
 "Renseignez le dans la fenêtre des préférences pour utiliser cette recherche."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Envoi de la requête (CddbId: %s, #pistes: %d, Longueur disque: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Trouvé(s) %d album(s) correspondant(s) pour le DiscID '%s'"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Impossible de charger le fichier '%s' (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Chargement de la liste des pistes de l'album ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1431,7 +1453,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Ecriture des Tags à partir de CDDB..."
 
@@ -1630,8 +1652,8 @@ msgstr "UTF-8 Invalide"
 msgid ""
 "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
-"La chaine UTF-8 '%s' n'a pas pu être convertie vers l'encodage du fichier (%"
-"s)."
+"La chaine UTF-8 '%s' n'a pas pu être convertie vers l'encodage du fichier "
+"(%s)."
 
 #: src/charset.c:707
 #, c-format
@@ -1691,7 +1713,7 @@ msgstr "Param
 msgid "Browser"
 msgstr "Sélecteur"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Fichier"
 
@@ -1705,11 +1727,11 @@ msgstr "Fichier Introuvable"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1717,7 +1739,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "Débit:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1725,17 +1747,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Fréq:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1752,7 +1774,7 @@ msgid "Time:"
 msgstr "Durée:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Tag"
 
@@ -1781,34 +1803,45 @@ msgstr "Artiste:"
 msgid "Tag selected files with this artist"
 msgstr "Les fichiers sélectionnés sont taggés avec cet artiste"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artiste:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Les fichiers sélectionnés sont taggés avec cet artiste"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Les fichiers sélectionnés sont taggés avec cet album"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Les fichiers sélectionnés sont taggés avec ce numéro de disque"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Année:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Les fichiers sélectionnés sont taggés avec cette année"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Renumérote les pistes sélectionnées séquentiellement. Et redémarre à 01 dans "
@@ -1816,11 +1849,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Piste N°:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1828,292 +1861,301 @@ msgstr ""
 "Mettre le nombre de fichiers, présents dans le répertoire, pour les pistes "
 "sélectionnées"
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Les fichiers sélectionnés sont taggés avec ce nombre de pistes"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Les fichiers sélectionnés sont taggés avec ce genre"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Comment.:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Les fichiers sélectionnés sont taggés avec ce commentaire"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Compositeur:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Les fichiers sélectionnés sont taggés avec ce compositeur"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Artiste Orig.:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Les fichiers sélectionnés sont taggés avec cet artiste original"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Les fichiers sélectionnés sont taggés avec ce copyright"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Les fichiers sélectionnés sont taggés avec cette URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Encodeur:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Les fichiers sélectionnés sont taggés avec ce nom d'encodeur"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Images"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Images:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Vous pouvez utiliser le Drag and Drop pour ajouter des images."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Les fichiers sélectionnés sont taggés avec ces images"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Ajouter des images au tag (le Drag and Drop est supporté)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Effacer les images sélectionnées, sinon toutes."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Sauvegarder les fichiers sélectionnés sur le disque dur."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Définir les propriétés des images sélectionnées."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec le titre '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Le titre a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec l'artiste '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "L'artiste a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Les fichiers sélectionnés sont taggés avec l'artiste '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "L'artiste a été supprimé dans les fichiers sélectionnés."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec l'album '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "L'album a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec le numéro de disque '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Le numéro de disque a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec l'année '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "L'année a été supprimée dans les fichiers sélectionnés."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
-"Les fichiers sélectionnés sont taggés avec un numéro de piste du type 'xx/%"
-"s'."
+"Les fichiers sélectionnés sont taggés avec un numéro de piste du type 'xx/"
+"%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 "Les fichiers sélectionnés sont taggés avec un numéro de piste du type 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "La piste a été supprimée dans les fichiers sélectionnés."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Les pistes sélectionnées ont été renumérotées!"
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec le genre '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Le genre a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec le commentaire '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Le commentaire a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec le compositeur '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Le compositeur a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec l'artiste original '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "L'artiste original a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec le copyright '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Le copyright a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec l'URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "L'URL a été supprimée dans les fichiers sélectionnés."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Les fichiers sélectionnés sont taggés avec le nom de l'encodeur '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Le nom de l'encodeur a été supprimé dans les fichiers sélectionnés."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Les fichiers sélectionnés sont taggés avec ces images."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Les images ont été supprimées des fichiers sélectionnés."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Sélectionner le Mode et le Masque, et refaire la même action"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Tous les tags ont été scannés"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Tous les tags ont été supprimés"
 
-#: src/easytag.c:2200
-#, c-format
+#: src/easytag.c:2240
+#, fuzzy, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 "Attention, plusieurs fichiers (%d fichier(s)) ont été modifiés par une "
 "application externe.\n"
 "Voulez-vous continuer quand même?"
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 msgid "Saving File(s)..."
 msgstr "Sauvegarde de(s) fichier(s) ..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr "La sauvegarde des fichiers a été stoppée..."
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Tous les fichiers ont été sauvés..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Les fichiers ont été partiellement effacés..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Tous les fichiers ont été effacés..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2122,16 +2164,16 @@ msgstr ""
 "Voulez-vous écrire le tag du fichier\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Ecriture des Tags..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Renommer le Fichier et le Répertoire..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2145,11 +2187,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Renommer le Répertoire..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2163,11 +2205,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Renommer le Fichier..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2180,17 +2222,17 @@ msgstr ""
 "par \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Ecriture du tag de '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Tag(s) écrit"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2199,19 +2241,19 @@ msgstr ""
 "Impossible d'écrire le tag du fichier '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr "Impossible d'écrire le tag du fichier '%s'! (%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Renomme le fichier '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2224,16 +2266,16 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr "Impossible de renommer le fichier '%s' par: '%s'! (%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Fichier(s) non renommé(s)..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2246,12 +2288,12 @@ msgstr ""
 "car ce fichier existe déjà :\n"
 "%s"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr "Impossible de renommer le fichier %s car ce fichier existe déjà : %s"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2262,22 +2304,22 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr "Impossible de créer le répertoire cible : '%s' (%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Fichier '%s' renommé en '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Fichier(s) renommé(s)..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2288,23 +2330,23 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr "Impossible d'effacer l'ancien répertoire '%s'! (%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Fichier '%s' déplacé vers '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Fichier(s) déplacé(s)..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2317,16 +2359,16 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr "Impossible de déplacer le fichier '%s' vers '%s'! (%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Fichier(s) non déplacé(s)..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2335,16 +2377,16 @@ msgstr ""
 "Voulez-vous réellement effacer définitivement le fichier\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Effacer le Fichier..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fichier: '%s' effacé"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2356,109 +2398,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Recherche en cours..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Fichier: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Trouvé(s) %d fichier(s) dans ce répertoire et sous répertoires."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Trouvé(s) %d fichier(s) dans ce répertoire."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fichier(s)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Aucun fichier trouvé dans ce répertoire et sous répertoires!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Aucun fichier trouvé dans ce répertoire!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Recherche en cours..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  ARRETER la recherche...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Séléctionner un répertoire à parcourir!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Tagger les fichiers sélectionnés avec ce champ"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Convertir '_' et '%20' par un espace"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Convertir ' ' par '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Tout en majuscule"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Tout en minuscule"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Première lettre en majuscule"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Première lettre de chaque mot en majuscule"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Enlever les espaces"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Insérer un espace avant une majuscule"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Supprimer les espaces ou underscores dupliqués"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Sortie anormale! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Signal reçu %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2468,11 +2509,11 @@ msgstr ""
 "rapport de bug accompagné de la trace gdb ('gdb easytag core' puis 'bt' et "
 "'l') et des informations pour le reproduire à l'adresse <easytag at gmail.com>"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Signal inconnu"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2505,11 +2546,11 @@ msgstr ""
 "path_to/files     Utiliser un chemin relatif.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Sortie normale."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2517,82 +2558,82 @@ msgstr ""
 "Des fichiers ont été modifiés mais pas sauvés...\n"
 "Voulez-vous les sauver avant de quitter le programme?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Voulez-vous réellement quitter le programme ?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Corrections automatiques appliquées sur le fichier '%s'."
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "Tag ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Tag Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "Tag FLAC Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "Tag APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "Tag MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Tag Wavpack"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "Fichier MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "Fichier MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Fichier Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Fichier Speex"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "Fichier FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "Fichier MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Fichier Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "Fichier MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Fichier Wavpack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Images (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2600,14 +2641,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2618,11 +2659,11 @@ msgstr ""
 "ne peut pas être converti vers l'encodage du système de fichiers\n"
 "(Essayez de définir la variable d'environnement G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Conversion du nom de fichier"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2647,12 +2688,12 @@ msgstr "Encodeur:"
 msgid "Channels:"
 msgstr "Canaux:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "ERREUR lors de l'ouverture du fichier: '%s' comme FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2661,42 +2702,42 @@ msgstr ""
 "La valeur de l'année '%s' semble ne pas être valide dans le fichier '%s'. "
 "Cette information sera perdue lors de la sauvegarde du tag."
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr "Le bloc image n'est pas valide : '%s'"
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERREUR: Impossible d'écrire les commentaires du fichier '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Le tag de '%s' a été écrit"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Le tag de '%s' a été supprimé"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Erreur lors de la suppression du tag ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Erreur lors de la suppression du tag ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Erreur lors de la mise à jour du tag ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2721,77 +2762,77 @@ msgstr ""
 "\n"
 "Fichier : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Erreur lors de la mise à jour du tag ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Le tag de '%s' a été mis à jour"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Aucune erreur reportée"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Pas de mémoire disponible"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Pas de donnée à analyser"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Donnée mal formatée"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Pas de tampon vers lequel écrire"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Le tampon est trop petit"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "ID du frame invalide"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Le champ demandé n'a pas été trouvé"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Type du champ inconnu"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Le tag est déjà attaché à un fichier"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Version du tag invalide"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Pas de fichier à analyser"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Tentative d'écriture vers un fichier en lecture seule"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Erreur dans la compression/décompression"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Message d'erreur inconnu!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2800,7 +2841,7 @@ msgstr ""
 "Comme le fichier corrompu : '%s'\n"
 "va causer une erreur dans id3lib, il ne sera pas traité par le programme."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Fichier corrompu..."
 
@@ -2808,74 +2849,74 @@ msgstr "Fichier corrompu..."
 msgid "Log"
 msgstr "Journal"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Sélectionner un fichier..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Sélectionner un répertoire..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Attention..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Aucun lecteur audio n'a été défini!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Impossible d'exécuter %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "o"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "Ko"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "Mo"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "Go"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "To"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Générer une liste de lecture"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Nom de la Liste de Lecture M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Utiliser le nom du répertoire"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Editer les Masques"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Options de la Liste de Lecture"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Inclure seulement les fichiers sélectionnés"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2883,30 +2924,30 @@ msgstr ""
 "Si activé, seulement les fichiers sélectionnés seront écrits dans la liste "
 "de lecture. Sinon, tous les fichiers seront pris."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Utiliser le chemin complet pour les fichiers"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Utiliser le chemin relatif pour les fichiers"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Créer la Liste de Lecture dans le rép. supérieur"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Si activé, la Liste de Lecture sera créée dans le répertoire supérieur."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Utiliser le séparateur de répertoires DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2914,23 +2955,23 @@ msgstr ""
 "Cette option remplace le séparateur de répertoires UNIX '/' par celui de DOS "
 "'\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Contenu de la Liste de Lecture"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Ecrire seulement la liste des fichiers"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Ecrire les infos en utilisant le nom du fichier"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Ecrire les infos en utilisant :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2939,12 +2980,12 @@ msgstr ""
 "Le fichier '%s' existe déjà!\n"
 "L'écraser?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Ecrire Liste de Lecture..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2953,24 +2994,24 @@ msgstr ""
 "Impossible d'écrire la liste de lecture '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "La liste de lecture '%s' a été écrite"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Encodeur"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Rechercher un fichier"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2978,86 +3019,86 @@ msgstr ""
 "afficher."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "Dans :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "le Nom de fichier"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "le Tag"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Sensible à la casse"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Trouvé(s) : %d fichier(s)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Charger les noms des fichiers à partir d'un fichier TXT"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Fichier :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Charger "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "Contenu du fichier TXT"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "Insérer un espace avant la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "Effacer la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Effacer toutes les lignes vides"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "Monter la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "Descendre la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Recharger"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "Liste de fichiers"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "Ligne sélectionnée"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3065,19 +3106,19 @@ msgstr ""
 "En activant cette option, après le chargement du nom des fichiers, le "
 "scanner courant sera exécuté (la fenêtre des scanners doit être ouverte)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Insérer une ligne vide"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Effacer cette ligne"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "Monter cette ligne"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "Descendre cette ligne"
 
@@ -3136,15 +3177,15 @@ msgstr ""
 #, c-format
 msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
 msgstr ""
-"Ogg Vorbis : La lecture depuis le media a retourné une erreur (fichier : '%"
-"s')."
+"Ogg Vorbis : La lecture depuis le media a retourné une erreur (fichier : "
+"'%s')."
 
 #: src/ogg_header.c:134
 #, c-format
 msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
 msgstr ""
-"Ogg Vorbis : Le flux binaire ne contient pas de données Vorbis (fichier : '%"
-"s')."
+"Ogg Vorbis : Le flux binaire ne contient pas de données Vorbis (fichier : "
+"'%s')."
 
 #: src/ogg_header.c:137
 #, c-format
@@ -3166,12 +3207,12 @@ msgstr ""
 "Ogg Vorbis : Erreur interne de logique, indocation d'un bug ou d'une "
 "corruption de pile (fichier ; '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERREUR lors de l'ouverture du fichier: '%s' en tant que vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Attention : Le fichier Vorbis Ogg '%s' contient un tag ID3v2."
@@ -3785,7 +3826,7 @@ msgid ""
 msgstr ""
 "Forcer l'utilisation de l'encodage du système et activer la transcription"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3803,7 +3844,7 @@ msgstr ""
 "Forcer l'utilisation de l'encodage du système et supprimer certains "
 "caractères"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3961,22 +4002,33 @@ msgstr "Utiliser la compression"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Utiliser la compression dans les tags ID3v2"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Jeu de caractères pour écrire les tags ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "Tags ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Ecrire le tag ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3985,11 +4037,11 @@ msgstr ""
 "jour au début des fichiers MP3. Sinon, il sera supprimé."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Version :"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4001,20 +4053,20 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Jeu de charactères :"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Type d'Unicode à utiliser"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 "Jeu de caractères à utiliser pour l'écriture des données du tag dans le "
@@ -4022,15 +4074,15 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Paramètres supplémentaires pour iconv() :"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Non"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
@@ -4040,25 +4092,25 @@ msgstr ""
 "l'encodage cible, il ne sera pas changé. Mais notez qu'un message d'erreur "
 "apparaîtra pour vous informer."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "Tags ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Ecrire le tag ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4066,30 +4118,30 @@ msgstr ""
 "Si cette option est activée, un tag à la norme ID3v1 sera ajouté ou mis à "
 "jour, à la fin des fichiers MP3. Sinon, il sera supprimé."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 "Jeu de caractères à utiliser pour l'écriture des données du tag ID3v1 dans "
 "le fichier."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Jeu de caractères pour lire les tags ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Non standard :"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4112,7 +4164,7 @@ msgstr ""
 "sélectionner l'encodage 'Windows-1251' pour charger des tags écrits sous "
 "Windows. Et 'KOI8-R' pour charger des tags écrits sous un système Unix."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "Jeu de caractères à utiliser pour la lecture des données du tag dans le "
@@ -4121,25 +4173,25 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Scanner Compléter Tag - Conversion de Caractères"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 "Convertir le caractère underscore '_' et la chaîne '%20' par un espace ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Convertir les espaces ' ' par des underscores '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4148,11 +4200,11 @@ msgstr ""
 "à partir du scanner de tags."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Scanner Renommer Fichier - Conversion de Caractères"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4161,19 +4213,19 @@ msgstr ""
 "à partir du scanner de fichiers."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Scanner Traiter les Champs - Conversion de Caractères"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Ne pas convertir en majuscule la première lettre de certaines prépositions "
 "et articles."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4186,15 +4238,15 @@ msgstr ""
 "'Text in an Entry' au lieu de 'Text In An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Fenêtre du Scanner"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Ouvrir la Fenêtre du Scanner au démarrage"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4202,11 +4254,11 @@ msgstr ""
 "Activer cette option pour ouvrir automatiquement la fenêtre des scanners au "
 "démarrage de EasyTAG."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Fenêtre du scanner toujours au dessus"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4215,16 +4267,16 @@ msgstr ""
 "fenêtre principale (toujours visible)."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Champs"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Ecraser les champs lors d'un Scan du tag"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4233,11 +4285,11 @@ msgstr ""
 "champs, par le nouveau. Si désactivé, seulement les champs vides seront "
 "complétés."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Mettre ce texte en commentaire par défaut :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4246,13 +4298,13 @@ msgstr ""
 "commentaire du tag lors de l'utilisation du scanner 'Compléter le Tag'."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Mettre la valeur CRC32 comme commentaire par défaut (pour fichier avec ID3 "
 "tag)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4263,42 +4315,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "Base de données CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Paramètres du Serveur pour la Recherche Automatique"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Nom :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "Chemin CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Paramètres du Serveur pour la Recherche Manuelle"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Base de données CD locale"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Chemin :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4310,52 +4362,52 @@ msgstr ""
 "'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' et 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Paramètres du Proxy"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Utiliser un proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Active les paramètres du serveur proxy."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Nom d'Hôte :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Nom du proxy."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Port du proxy."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Nom d'Utilisateur :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Nom de l'utilisateur sur le serveur proxy."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Mot de Passe Utilisateur :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Mot de Passe de l'utilisateur sur le serveur proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Liste des Noms de Pistes"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4363,7 +4415,7 @@ msgstr ""
 "Sélectionner le fichier audio correspondant (d'après la position ou "
 "l'algorithme DLM si activé en dessous)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4373,7 +4425,7 @@ msgstr ""
 "sélectionné."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4385,15 +4437,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Confirmer la sortie du programme"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4401,57 +4453,61 @@ msgstr ""
 "Si cette option est activée, une boîte de dialogue s'ouvrira pour demander "
 "confirmation avant la fermeture de l'application."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Confirmer l'écriture du tag du fichier"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Confirmer pour renommer les fichiers"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Confirmer l'effacement des fichiers"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Confirmer l'écriture de la liste de lecture"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Appliquer les changements (mais ne pas sauver) et fermer cette fenêtre"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Fermer cette fenêtre sans sauver"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Sauver les changements et fermer cette fenêtre"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exemple : %.*d_-_Piste_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Changements appliqués"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Configuration sauvée"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Configuration inchangée"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4462,37 +4518,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Ce n'est pas un répertoire"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Le programme de lecture audio '%s' n'a pas été trouvé!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Compléter Tag"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Renommer le Fichier et le Répertoire"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Traiter Champs"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Tag scanné avec succès..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag scanné avec succès...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4500,23 +4556,23 @@ msgstr ""
 "Scanner de tags : étrange..., l'extension '%s' n'a pas été trouvée dans le "
 "nom de fichier '%s'!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Erreur de scanner: Impossible de trouver le séparateur '%s' dans '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 "Impossible de convertir le nom de fichier '%s' vers l'encodage du système de "
 "fichiers."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Nouveau nom de fichier scanné avec succès..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nouveau nom de fichier scanné avec succès...(%s)"
@@ -4524,41 +4580,41 @@ msgstr "Nouveau nom de fichier scann
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Scanner de Tag et de Nom du Fichier"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Scanner : "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Sélectionner le type du scanner à utiliser"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Ouvrir fenêtre de Scan / Scanner le(s) fichier(s) sélectionné(s)"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Options du Scanner"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Montrer / Cacher l'Editeur de Masques"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Montrer / Cacher la Légende"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4567,15 +4623,15 @@ msgstr ""
 "analyser le nom du fichier et le chemin, afin de compléter les champs du tag."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Apercu du scanner de tag..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Préfixer le masque avec le chemin courant"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4588,15 +4644,15 @@ msgstr ""
 "sinon d'un chemin relatif par rapport à l'ancien."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Apercu du renommeur de fichiers..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Champs:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4605,126 +4661,136 @@ msgstr ""
 "Sélectionnez ceux qui vous intéressent."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Traiter le champ du nom de fichier"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Traiter le champ du titre"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Traiter le champ de l'artiste"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Traiter le champ de l'artiste"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Traiter le champ de l'album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Traiter le champ du genre"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Traiter le champ du commentaire"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Traiter le champ du compositeur"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "Ao"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Traiter le champ de l'artiste originel"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Traiter le champ du copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Traiter le champ de l'URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Traiter le champ du nom de l'encodeur"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Inverser la sélection"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Tout (Dé)Sélectionner."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Convertir '_' et '%20' par ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Convertir :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "par : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4732,7 +4798,7 @@ msgstr ""
 "Le caractère underscore ou la chaîne %20 seront remplacés par un espace "
 "(exemple, avant : 'Text%20In%20An_Entry', après : 'Text In An Entry')."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4740,18 +4806,18 @@ msgstr ""
 "Le caractère espace est remplacé par un caractère underscore (exemple, "
 "avant : 'Text In An Entry', après : 'Text_In_An_Entry')."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 "Remplace une chaine par une autre. Notez que la recherche est sensible à la "
 "casse."
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr "Détecter les chiffres romains"
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4759,7 +4825,7 @@ msgstr ""
 "Toutes les lettres sont mises en majuscules (exemple, avant : 'Text IN AN "
 "entry', après : 'TEXT IN AN ENTRY')."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4767,7 +4833,7 @@ msgstr ""
 "Toutes les lettres sont mises en minuscules (exemple, avant : 'Text IN AN "
 "entry', après : 'text in an entry')."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4776,7 +4842,7 @@ msgstr ""
 "majuscule et minuscules (exemple, avant : 'text IN An ENTRY', après : 'Text "
 "in an entry')."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4784,7 +4850,7 @@ msgstr ""
 "La première lettre de chaque mot est mise en majuscule et les autres en "
 "minuscules (exemple, avant : 'Text in an ENTRY', après : 'Text In An Entry')."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4792,15 +4858,15 @@ msgstr ""
 "Forcer la conversion en majuscules des chiffres Romains (exemple, avant : "
 "'ix. text in an entry', après : 'IX. Text In An Entry')."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Insérer un espace avant une majuscule"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Effacer les espaces ou underscores dupliqués"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4808,7 +4874,7 @@ msgstr ""
 "Tous les espaces sont supprimés (exemple, avant: 'Text In An Entry', après: "
 "'TextInAnEntry')."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4816,7 +4882,7 @@ msgstr ""
 "Avec cette option, vous pouvez ajouter un espace avant chaque lettre en "
 "majuscule (exemple, avant : 'TextInAnEntry', après : 'Text In An Entry')."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4827,183 +4893,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Légende"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artiste"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : artiste"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commentaire"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositeur"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : copyright:"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : n° disque"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : encodé par"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignoré"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : nombre de pistes"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artiste orig."
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : piste"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : titre"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : année"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Editeur de Masque"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Créer un Nouveau Masque"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Monter ce Masque"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Descendre ce Masque"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Dupliquer le Masque"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Ajouter les Masques par Défaut"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Effacer le Masque"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Sauver les Masques"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nouveau_masque"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Copier: Ancune ligne sélectionnée!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Effacer: Ancune ligne sélectionnée!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Monter: Ancune ligne sélectionnée!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Descendre: Ancune ligne sélectionnée!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ERREUR: Impossible d'écrire le fichier de configuration: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Impossible d'ouvrir le fichier de configuration '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Chargement de la configuration par défaut..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Impossible de créer ou d'ouvrir le fichier '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ERREUR: Impossible d'écrire la liste vers le fichier: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Chargement des masques par défaut pour 'Compléter les Tags' ..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Chargement des masques par défaut pour 'Renommer Fichier' ..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Chargement des masques par défaut pour 'Renommer le Répertoire' ..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERREUR: La variable d'environnement HOME n'est pas définie!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERREUR: Impossible de créer le répertoire '%s' (%s)!"
@@ -5244,8 +5315,8 @@ msgstr "Lecteur Audio : '%s'"
 #~ "défaut).\n"
 #~ "\n"
 #~ "Si un encodage différent est sélectionné avec 'Utiliser un encodage non "
-#~ "standard pour écrire les tags ID3', celui-ci sera utilisé au lieu de ISO-"
-#~ "8859-1.\n"
+#~ "standard pour écrire les tags ID3', celui-ci sera utilisé au lieu de "
+#~ "ISO-8859-1.\n"
 #~ "Des règles peuvent également être définies si certains caractères ne "
 #~ "peuvent pas être convertis."
 
@@ -5264,8 +5335,8 @@ msgstr "Lecteur Audio : '%s'"
 #~ "défaut).\n"
 #~ "\n"
 #~ "Si un encodage différent est sélectionné avec 'Utiliser un encodage non "
-#~ "standard pour écrire les tags ID3', celui-ci sera utilisé au lieu de ISO-"
-#~ "8859-1."
+#~ "standard pour écrire les tags ID3', celui-ci sera utilisé au lieu de "
+#~ "ISO-8859-1."
 
 #~ msgid ""
 #~ "For ISO-8859-1 fields, override with the following character encodings "
diff --git a/po/he.gmo b/po/he.gmo
index de27cb2..6b56075 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index 799beda..f01460e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-06-13 08:59+0300\n"
 "Last-Translator: Yuval Hager <yuval at avramzon.net>\n"
 "Language-Team: Hebrew <he at li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,6 +25,7 @@ msgid ""
 msgstr ""
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(תרגום לגרמנית)"
 
@@ -106,111 +108,111 @@ msgstr "(תרגום ליוונית)"
 msgid "(Serbian translation)"
 msgstr "(תרגום לגרמנית)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "הערה"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "אודות..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "אודות"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(קומפל: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(משתמש ב: GTK+ %d.%d.%d וכן id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "מחבר: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "דוא\"ל: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "אתר: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "תיאור:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "אין די זכרון"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(ללא תמיכה ב Ogg Vorbis)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(ללא תמיכה ב FLAC)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(ללא תמיכה ב MP4/AAC)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(ללא תמיכה ב MP3)"
@@ -218,33 +220,33 @@ msgstr "(ללא תמיכה ב MP3)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "תודות"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "תרגומים:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "כללי:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "שינויים"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "לא ניתן לפתוח את הקובץ '%s' (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "שגיאה בפתיחת קובץ: '%s' (%s)."
@@ -252,484 +254,494 @@ msgstr "שגיאה בפתיחת קובץ: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_קובץ"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "מיון רשימה לפי תג"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "מיון הרשימה על פי תכונה"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "עולה לפי שם קובץ"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "יורד לפי שם קובץ"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "עולה לפי תאריך יצירה"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "יורד לפי תאריך יצירה"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "עולה לפי מספר רצועה"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "יורד לפי מספר רצועה"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "עולה לפי שם"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "יורד לפי שם"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "עולה לפי אמן"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "יורד לפי אמן"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "עולה לפי אמן"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "יורד לפי אמן"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "עולה לפי אלבום"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "יורד לפי אלבום"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "עולה לפי שנה"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "יורד לפי שנה"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "עולה לפי סגנון"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "יורד לפי סגנון"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "עולה לפי הערה"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "יורד לפי הערה"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "עולה לפי מלחין"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "יורד לפי מלחין"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "עולה לפי אמן מקורי"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "יורד לפי אמן מקורי"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "עולה לפי זכויות"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "יורד לפי זכויות"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "עולה לפי URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "יורד לפי URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "עולה לפי שם מקודד"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "יורד לפי שם מקודד"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "עולה לפי סוג קובץ"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "יורד לפי סוג קובץ"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "עולה לפי גודל קובץ"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "יורד לפי גודל קובץ"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "עולה לפי משך"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "יורד לפי משך"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "עולה לפי bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "יורד לפי bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "עולה לפי קצב דגימה"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "יורד לפי קצב דגימה"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "פתח באמצעות ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "בחר הכל"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "בטל בחירת הכל"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "הפוך בחירה"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "מחק"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "הקובץ ה_ראשון"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "הקובץ הראשון"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "הקובץ ה_קודם"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "הקובץ הקודם"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "הקובץ הב_א"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "הקובץ הבא"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "הקובץ הא_חרון"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "הקובץ האחרון"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "_סרוק קבצים"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "סרוק קבצים"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_מחק תגים"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "מחק תג(ים)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "ב_טל שינויים אחרונים בקבצים"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "בטל שינויים אחרון בקבצים"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "ב_צע מחדש שינויים אחרונים בקבצים"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "בצע מחדש שינויים אחרון קבצים"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_שמור קבצים"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "שמור קבצים"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "הכר_ח שמירת קבצים"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "הכרח שמירה קבצים"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "בטל שינויים אחרונים"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "בצע מחדש שינויים אחרונים"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_צא "
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "צא"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_דפדפן"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "עבור לתיקיית ה_בית"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "עבור לתיקיית הבית"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "עבור לתיקיית ברירת המחדל"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "עבור לתיקיית הבית"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "עבור לתיקיית הבית"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "עבור לתיקיית הבית"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "עבור לתיקיית ברירת המח_דל"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "עבור לתיקיית ברירת המחדל"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "קבע את המיקום הנוכחי כברירת מח_דל"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "קבע את המיקום הנוכחי כברירת מחדל"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "תצוגת עץ | תצוגת אמן-אלבום"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "שנה שם תיקייה ..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "טען תיקייה מחדש"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "עיין בתיקייה באמצעות ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_קפל עץ"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_רענן עץ"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "_סורק"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_מלא תגים ..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "מלא תגים ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_שנה שמות קבצים ותיקיות ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "שנם שמות קבצים ותיקיות ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_עבד שדות ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "עבד שדות ..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_שונות"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "חיפוש _קבצים ..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "חיפוש קבצים ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "חיפוש ב_מסד הנתונים ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "חיפוש CDDB ..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "טען שמות קבצים מקובץ TXT ..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "כתוב רשימת השמעה ..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "הרץ נגן חיצוני"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_הגדרות"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "העד_פות ..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "העדפות ..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_עזרה"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_אודות"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "עצור פעולה נוכחית"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "פעולות _קבצים"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "חיפוש ב CDDB ..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "נקה יומן"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "עיין בתיקיות _משנה"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "הראה תיקיות חבויות"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "הראה עץ / הצג לפי אמן ואלבום"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "לא ניתן לאחד את הממשק, השגיאה היתה ב: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "מוכן להתחיל..."
 
@@ -738,7 +750,7 @@ msgid "New default path for files selected"
 msgstr "נבחר מיקום ברירת מחדל חדש לקבצים"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "אישור..."
 
@@ -750,87 +762,92 @@ msgstr ""
 "מספר קבצים שונו אך לא נשמרו...\n"
 "האם לשמור אותם לפני החלפת התיקיה?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<כל האלבומים>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "שגיאה: בחיפוש אחר %s, לא נמצא %s בעץ."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "×¢×¥"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "שם קובץ"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "כותרת"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "אמן"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "אמן"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "אלבום"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "שנה"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "רצועה"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "ז'אנר"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "מלחין"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "אמן מקורי"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "זכויות"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "אתר"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "קודד ע\"י"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# אלבומים"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# קבצים"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "עבור לתיקיית אב"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "הכנס תיקייה לעיון"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "בחר תיקייה לעיון!"
@@ -838,33 +855,33 @@ msgstr "בחר תיקייה לעיון!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u קבצים"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "אמן ואלבום"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "שנה שם לתיקייה"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "שנה שם תיקייה '%s' ל:"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "השתמש במסכה:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "אם מופעל, ישתמש במסכות לשינוי שם תיקייה."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -872,31 +889,31 @@ msgstr ""
 "בחר או הכנס מסכה בעזרת הקודים (ראה מקרא בחלון הסורק) כדי לשנות את שם התיקיה "
 "מתוך שדות התגים."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "מסכת סורק לא תקפה"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "תצוגה מקדימה של שינוי שם תיקייה..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "שגיאה..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "יש להכניס שם תיקייה!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "לא ניתן להמיר '%s' לקידוד שם קובץ. אנא השתמש בשם אחר."
@@ -929,7 +946,7 @@ msgstr "לא ניתן להמיר '%s' לקידוד שם קובץ. אנא השת
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -938,7 +955,7 @@ msgstr ""
 "לא ניתן לשנות את שם התיקיה כי השם כבר קיים!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -953,84 +970,84 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "שם התיקייה שונה"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "תוכנית להריץ :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "הכנס את שם התוכנית להרצה. התוכנית תקבל את התיקיה הנוכחית כפרמטר."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "פתח קובץ באמצעות ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "הכנס את שם התוכנית להרצה. התוכנית תקבל את שם הקובץ הנוכחי כפרמטר."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "יש להניס שם תוכנית"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "לא ניתן למצוא את התוכנית '%s'!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "לא ניתן להריץ את %s (שגיאה %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "לא ניתן לפצל תהליך חדש!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "הפקודה שהורצה: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "אמן / אלבום"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "סווג"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "שם רצועה"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "זמן"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "חיפוש בבסיס הנתונים של הדיסקים"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "חיפוש אוטומטי"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "שאילתא לבסיס הנתונים של הדיסקים :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1038,16 +1055,16 @@ msgstr ""
 "חפש באופן אוטומטי ב CDDB לפי הקבצים שנבחרו (הסדר חשוב!) כדי לייצר את המזהה "
 "של הדיסק ב CDDB."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "עצור את החיפוש ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "השתמש ב CDDB מקומי"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1058,137 +1075,137 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "חיפוש ידני"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "מילים :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "הכנס את המילים לחיפוש (מופרדות ברווחים או '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "חפש ב :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "כל השדות"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "אחר"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "כל הסיווגים"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "בלוז"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "קלאסי"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "קאונטרי"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "עממי"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "ג'אז"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "שונות"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "ניואייג'"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "ראגיי"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "רוק"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "פסקול"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "כולל: פאנק, נשמה, ראפ, פופ, תעשייתי, מטאל ועוד"
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "סרטים, הופעות"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "כאלו שלא מתאימים לסיווגים האחרים"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " סיווגים"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "תוצאות :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "חיפוש :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "הכנס את המילים לחיפוש ברשימה למטה"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "חפש את הבא"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "חפש את הקודם"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "הראה רק שורות אדומות (או הראה את כל השורות) ברשימת ה'אמן / אלבום'"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "בטל בחירה לכל השורות"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "הפוך בחירת שורות"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "בחר את כל השורות"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1200,36 +1217,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "קבע כ :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "הכל"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "מספר רצועה"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "מספר רצועות"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "הרץ את הסורק הנוכחי לכל קובץ"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "התאם שורות בעזרת אלגוריתם לבנשטיין"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1238,90 +1255,94 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "העלה את השורות שנבחרו או כל השורות (אם לא נבחרה אף שורה)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "מוכן לחיפוש..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr "אלבום: '%s', אומן: '%s', אורך: '%s', שנה: '%s', ז,אנר: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "הפוך בחירה"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "מיין לפי מספר רצועה"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "מיון לפי שם רצועה"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "מחפש מארח '%s' ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "לא מצאתי את המארח '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "לא מצליח לייצר socket חדש (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "מתחבר לשרת '%s', פורט '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "לא מצליח להתחבר לשרת '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "מחובר לשרת '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "מקבל מידע (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "שגיאה בקריאת תשובת CDDB (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "לא ניתן ליצור קובץ '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "לא ניתן לפתוח קובץ '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "שולח בקשה ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "לא ניתן לשלוח בקשה (%s)!"
@@ -1330,89 +1351,90 @@ msgstr "לא ניתן לשלוח בקשה (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "מקבל נתונים ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "השרת החזיר תשובה לא נכונה!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "השרת החזיר תשובה לא נכונה! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "סליחה, אל החיפוש מבוסס הרשת כרגע לא פעיל!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "נמצאו %d אלבומ(ים) מתאימ(ים)"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "מקבל נתונים עבור עמוד %d ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "מקבל נתונים עבור עמוד %d ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "העלאת תוצאות נוספות ..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "לא נבחר קובץ!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d קבצים נבחרו!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "חיפוש CD מקומי..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "נמצאו %d אלבומים מתאימים למזהה דיסק '%s'"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "לא ניתן להעלות קובץ: '%s' (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "מעלה את רשימת הרצועות באלבום"
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1421,7 +1443,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "כתוב תג מתוך בסיס הנתונים..."
 
@@ -1679,7 +1701,7 @@ msgstr "משתנה או מסלול לא ידוע '%s'\n"
 msgid "Browser"
 msgstr "דפדפן"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "קובץ"
 
@@ -1693,11 +1715,11 @@ msgstr ""
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr ""
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, שכבה ?"
 
@@ -1705,7 +1727,7 @@ msgstr "?, שכבה ?"
 msgid "Bitrate:"
 msgstr "קצב:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? קילוביט לשניה"
 
@@ -1713,17 +1735,17 @@ msgstr "? קילוביט לשניה"
 msgid "Freq:"
 msgstr "תדר:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? הרץ"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "מצב:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1740,7 +1762,7 @@ msgid "Time:"
 msgstr "זמן:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "תג"
 
@@ -1769,330 +1791,350 @@ msgstr "אומן:"
 msgid "Tag selected files with this artist"
 msgstr "תייג את הקבצים הנבחרים עם אומן זה"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "אומן:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "תייג את הקבצים הנבחרים עם אומן זה"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "אלבום:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "תייג את הקבצים הנבחרים עם אלבום זה"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "דיסק:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "תייג את הקבצים הנבחרים עם מספר דיסק זה"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "שנה:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "תייג את הקבצים הנבחרים עם שנה זאת"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "מספר את הרצועות שנבחרו סדרתית. מתחיל ב 01, לכל תת-תיקייה."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "מספר רצועה:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr "קבע את מספר הקבצים באותה תיקייה כמו קובץ זה, עבור הרצועות הנבחרות."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "תייג את הקבצים הנבחרים עם מספר רצועות זה"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "ז'אנר:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "תייג את הקבצים הנבחרים עם ז'אנר זה"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "הערה:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "תייג את הקבצים הנבחרים עם הערה זו"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "מלחין:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "תייג את הקבצים הנבחרים עם מלחין זה"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "אמן מקורי:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "תייג את הקבצים הנבחרים עם אומן מקורי זה"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "זכויות:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "תייג את הקבצים הנבחרים עם זכויות אלו"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "אתר:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "תייג את הקבצים הנבחרים עם אתר אומן זה"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "קודד ע\"י"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "תייג את הקבצים הנבחרים עם שם מקודד זה"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "תמונות"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "תמונות:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "תוכל לגרור תמונה כדי להוסיף אותה לכאן."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "תייג את הקבצים הנבחרים עם תמונות אלה"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "הוסף תמונות לתג (ניתן גם לגרור תמונות לכאן)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "מחק תמונות נבחרות, או את כולן."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "שמור את התמונות שנבחרו לדיסק הקשיח."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "קבע את התכונות לתמונות שנבחרו."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "הקבצים שנבחרו תויגו עם הכותרת '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "הכותרת נמחקה מהקבצים שנבחרו."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "הקבצים שנבחרו תויגו עם האומן '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "האומן נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "הקבצים שנבחרו תויגו עם האומן '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "האומן נמחק מהקבצים שנבחרו."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "הקבצים שנבחרו תויגו עם האלבום '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "שם האלבום נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "הקבצים שנבחרו תויגו עם מספר דיסק '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "מספר הדיסק נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "הקבצים שנבחרו תויגו עם שנה '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "השנה נמחקה מהקבצים שנבחרו."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "הקבצים שנבחרו תויגו עם רצועה כמו 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "הקבצים שנבחרו תויגו ברצועה כמו 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "מספר רצועה נמחקה מהקבצים שנבחרו."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "הקבצים שנבחרו מוספרו באופן סדרתי."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "הקבצים שנבחרו תויגו עם ז'אנר '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "הז'אנר נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "הקבצים שנבחרו תויגו עם הערה '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "ההערה נמחקה מהקבצים שנבחרו."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "הקבצים שנבחרו תויגו עם מלחין '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "המלחין נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "הקבצים שנבחרו תויגו עם אומן מקורי '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "האמן המקורי נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "הקבצים שנבחרו תויגו עם זכויות '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "הזכויות נמחקו מהקבצים שנבחרו."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "הקבצים שנבחרו תויגו עם אתר '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "האתר נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "הקבצים שנבחרו תויגו עם מקודד '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "שם המקודד נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "הקבצים שנבחרו תויגו בתמונות."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "התמונות נמחקו מהקבצים שנבחרו."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "בחר מצב ומסכה, ובצע מחדש את אותה הפעולה "
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "כל התגים נסרקו"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "כל התגים נמחקו"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "חיפוש קבצים ..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "כל הקבצים נשמרו..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "חלק מהקבצים נמחקו..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "כל הקבצים נמחקו..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2101,16 +2143,16 @@ msgstr ""
 "האם ברצונך לשמור את תג הקובץ\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "שמור תג..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "שנה שם קובץ ותיקייה..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2124,11 +2166,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "שנה שם תיקייה..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2142,11 +2184,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "שנה שם קובץ..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2159,17 +2201,17 @@ msgstr ""
 "אל \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "שמירת תג לקובץ '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "תג(ים) נשמרו"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2178,21 +2220,21 @@ msgstr ""
 "לא ניתן לכתוב תג בקובץ '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "לא ניתן לכתוב תג בקובץ '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "משנה שם לקובץ '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2205,7 +2247,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2214,11 +2256,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "שמות הקבצים לא שונו.."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2231,7 +2273,7 @@ msgstr ""
 "בגלל שהקובץ הבא כבר קיים:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2240,7 +2282,7 @@ msgstr ""
 "בגלל שהקובץ הבא כבר קיים:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2251,7 +2293,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2260,16 +2302,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "שם הקובץ '%s' שונה ל '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "שמות קבצים שונו..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2280,7 +2322,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2289,17 +2331,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "הקובץ '%s' הועבר ל '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "קבצים הועברו..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2312,7 +2354,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2321,11 +2363,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "קבצים לא הועברו..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2334,16 +2376,16 @@ msgstr ""
 "האם אתה באמת רוצה למחוק לתמיד את הקובץ\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "מוחק קובץ..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "קובץ '%s' נמחק"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2355,109 +2397,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "החיפוש מתבצע..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "קובץ: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "נמצאו %d קבצים בתיקייה זו ובתיקיות המשנה שלה."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "נמצאו %d קבצים בתיקייה זו."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u קבצים"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "לא נמצאו קבצים בתיקייה זו ובתיקיות המשנה שלה!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "לא נמצאו קבצים בתיקייה זו!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "מחפש..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "עצור את החיפוש..."
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "בחר תיקייה לעיון!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "תייג את הקבצים שנבחרו בשדה זה"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "המר '_' ו '%20' לרווחים"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "המר ' ' ל '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "הכל באותיות גדולות"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "הכל באותיות קטנות"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "אות ראשונה גדולה"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "אות ראשונה גדולה בכל מילה"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "מחק רווחים"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "הכנס רווח לפני אות גדולה"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "מחק רווחים או קוים תחתונים כפולים"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: יציאה לא מסודרת! (מספר תהליך: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "התקבל סיגנל %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2467,11 +2508,11 @@ msgstr ""
 "'gdb easytag core' ואז 'bt' ואז 'l') ומידע על איך לשחזר את התקלה ל "
 "easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "סיגנל לא מוכר"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2490,11 +2531,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: יציאה מסודרת."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2502,83 +2543,83 @@ msgstr ""
 "חלק מהקבצים שונו אך לא נשמרו...\n"
 "האם ברצונך לשמור אותם לפני הסיום?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "האם אתה באמת רוצה לסיים את מהתוכנית?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "תג ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "תג Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "תג FLAC Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "תג APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "תג MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "תג Wavpack"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "קובץ MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "קובץ MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "קובץ Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "הקובץ הבא"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "קובץ FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "קובץ MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "קובץ Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "קובץ MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "קובץ Wavpack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "תמונות"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2586,14 +2627,14 @@ msgid "%d kb/s"
 msgstr "%d קילוביט לשנייה"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d הרץ"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2601,11 +2642,11 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "תרגום שם קובץ"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "בשם הקובץ '%s' יש יותר מ%d תוים ולכן יקוצץ!\n"
@@ -2629,54 +2670,54 @@ msgstr "מקודד:"
 msgid "Channels:"
 msgstr "ערוצים:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "שגיאה בפתיחת קובץ: '%s' כקובץ  FLAC (%s).\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "שגיאה: כתיבת ההערות לקובץ נכשלה '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "התג נכתב לקובץ '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "התג נמחק מהקובץ '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "שגיאה במחיקת תג מסוג ID3v1 בקובץ '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "שגיאה במחיקת תג מסוג ID3v2 בקובץ '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "שגיאב בעדכון תג מסוג ID3v2 בקובץ '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2698,77 +2739,77 @@ msgstr ""
 "בלבד!\n"
 "קובץ : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "שגיאה בעדכון תג מסוג ID3V1 בקובץ '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "התג בקובץ '%s' עודכן"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "לא דווחו שגיאות"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "אין די זכרון"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "אין נתונים לעיבוד"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "נתונים לא מסודרים כראוי"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "אין מחיצה לכתוב אליה"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "מחיצה קטנה מדי"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "מזהה ה frame לא תקף"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "השדה לא נמצא"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "סוג שדה לא מוכר"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "התג כבר נמצא בקובץ"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "גרסה לא תקפה של התג"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "אין קובץ לעיבוד"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "מנסה לכתוב לקובץ לקריאה בלבד"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "שגיאה בדחיסה/פריסה"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "שגיאה לא מוכרת!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2777,7 +2818,7 @@ msgstr ""
 "כיוון שהקובץ המושחת הבא: '%s'\n"
 "ייצור שגיאה ב id3lib, הוא לא יעובד ע\"י התוכנית."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "קובץ מושחת..."
 
@@ -2785,125 +2826,125 @@ msgstr "קובץ מושחת..."
 msgid "Log"
 msgstr "יומן"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "בחר קובץ..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "בחר תיקייה..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "אזהרה..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "לא מוגדר נגן"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "לא ניתן להריץ %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "בייטים"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "קילובייט"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "מגהבייט"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "ג'יגהבייט"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "טרהבייט"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "ייצר רשימת השמעה"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "שם רשימת ההשמעה מסוג M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "השתמש בשם התיקייה"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "ערוך מסכות"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "אפשרויות רשימת השמעה"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "כלול רק את הקבצים הנבחרים"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
 "אם מופעל, רק הקבצים הנבחרים ייכתבו לרשימת ההשמעה, אחרת, כל הקבצים ייכתבו."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "השתמש במסלול מלא לקבצים ברשימת ההשמעה"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "השתמש במסלול יחסי לקבצים ברשימת ההשמעה"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "צור רשימת השמעה בתיקיית האב"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "אם מופעל, רשימת ההשמעה תיוצר בתיקיית האב."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "השתמש במפריד תיקייות של DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "אפשרות זו מחליפה את מפריד התיקיות של UNIX - '/' בזה של DOS - '\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "תוכן רשימת ההשמעה"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "כתוב רק את רשימת הקבצים"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "כתוב מידע מתוך שם הקובץ"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "כתוב מידע מתוך:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2912,12 +2953,12 @@ msgstr ""
 "קובץ רשימת ההשמעה '%s' כבר קיים!\n"
 "לשכתב?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "כתוב רשימת השמעה..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2926,135 +2967,135 @@ msgstr ""
 "לא ניתן לכתוב את קובץ רשימת ההשמעה '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "רשימת ההשמעה נכתבה '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "דיסק"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "קודד ע\"י"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "חפש קובץ"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "כתוב את המילה שברצונך לחפש בקבצים. אם לא תרשום כלום, יוחזרו כל הקבצים."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "בתוך :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "שם הקובץ"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "התג"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "הבחנה בין אותיות גדולות לקטנות"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "נמצאו: %d קבצים"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "העלה את שמות הקבצים מתוך קובץ TXT"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "קובץ :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " העלה"
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "אישור שינוי שם לקובץ"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "הכנס רווח לפני אות גדולה"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "מחק שורה זו"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "מחק את כל השורות הריקות"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "כלול רק את הקבצים הנבחרים"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "כלול רק את הקבצים הנבחרים"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "טען מחדש"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "כתוב רק את רשימת הקבצים"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "בחר את כל השורות"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
 msgstr ""
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "הכנס שורה ריקה"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "מחק שורה זו"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "הזז מסכה זו למעלה"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "הזז מסכה זו למטה"
@@ -3135,12 +3176,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr ""
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr ""
@@ -3713,7 +3754,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3726,7 +3767,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3860,36 +3901,47 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "קידוד תוים עבור תגי ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "כתוב תג ID3V2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "כתוב תג ID3V2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr ""
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "תיאור:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3898,91 +3950,91 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "יוניקוד (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "קודד ע\"י"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr "לא"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "תג ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr ""
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "קידוד תוים עבור תגי ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -3991,59 +4043,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr ""
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "סורק"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "סורק למילוי תגים - המרת תוים"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "המר קו תחתי '_' ואת המחרוזת '%20' לרווח - ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "המר רווחים ' ' לקו תחתי '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "סורק לשינוי שמות קבצים - המרת תוים"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "סורק לעיבוד שדות - המרת תוים"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4052,62 +4104,62 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "חלון הסורק"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "פתח את חלון הסורק באתחול"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "חלון הסורק תמיד למעלה"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr ""
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "שדות"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "שכתב שדות בסריקת תג"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "קבע את הטקסט הבא כהערת ברירת מחדל :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4116,42 +4168,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "בסיס נתונים של הדיסקים"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "שם :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "פורט :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "מסלול CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "הגדרות שרת לחיפוש ידני"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "חיפוש בבסיס נתונים מקומי"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "מסלול :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4160,65 +4212,65 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "הגדרות פרוקסי"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "השתמש בפרוקסי"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "שם מארח :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "שם שרת הפרוקסי."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "הפורט של שרת הפרוקסי."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "שם משתמש :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "שם המשתמש בשרת הפרוקסי."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "סיסמא :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "הסיסמא של המשתמש בשרת הפרוקסי."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "רשימת שמות רצועות"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
 msgstr ""
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4228,71 +4280,75 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "אישור"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "אישור לפני סיום התוכנית"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "אם מופעל, פותח חלון לקבלת אישור לפני סיום התוכנית."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "אישור כתיבת תג לקובץ"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "אישור שינוי שם לקובץ"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "אישור מחיקת קובץ"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "אישור כתיבת רשימת השמעה"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "החל שינויים (אך אל תשמור) וסגור חלון זה"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "סגור חלון זה בלי לשמור"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "שמור שינויים וסגור חלון זה"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(דוגמא : %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "השינויים הוחלו"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "ההגדרות נשמרו"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "ההגדרות לא השתנו"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4300,57 +4356,57 @@ msgid ""
 "(%s) "
 msgstr ""
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "לא תיקייה"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "לא ניתן למצוא את הנגן '%s'!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "מלא תג"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "שנה שם קובץ ותיקייה"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "עבד שדות"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "תגים נסרקו בהצלחה..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "תגים נסרקו בהצלחה...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr "סורק תגים: מוזר..., הסיומת '%s' לא נמצאה בקובץ '%s'!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "שגיאת סריקה: לא ניתן למצוא את המפריד '%s' בתוך '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "שם קובץ חדש נסרק בהצלחה..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "שם קובץ חדש נסרק בהצלחה...(%s)"
@@ -4358,41 +4414,41 @@ msgstr "שם קובץ חדש נסרק בהצלחה...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "סורק תגים ושמות קבצים"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "סורק:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "בחר את סוג הסורק לשימוש"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "פתח את חלון הסורק / סרוק את הקבצים שנבחרו"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "אפשרויות סורק"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "הצג / החבא את עורך המסכות"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "הצג / החבא מקרא"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "סגור חלון זה"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4401,15 +4457,15 @@ msgstr ""
 "למילוי שדות התגים."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "תצוגה מקדימה של מילוי התגים..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4418,212 +4474,222 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "תצוגה מקדימה לשינוי השם..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "בחר שדות:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
 msgstr ""
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "ק"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "עבד את שדה שם הקובץ"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "×›"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "עבד את שדה הכותרת"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "או"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "עבד את שדה האומן"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "עבד את שדה האומן"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "אל"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "עבד את שדה האלבום"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "×–"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "עבד את שדה הז'אנר"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "×”"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "עבד את שדה ההערה"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "מ"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "עבד את שדה המלחין"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "מק"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "עבד את שדה האומן המקורי"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "×–×›"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "עבד את שדה הזכויות"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "את"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "עבד את שדה האתר"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "מק"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "עבד את שדה המקודד"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "הפוך בחירה"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "בחר/בטל הכל."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "המר '_' ו'%20' ל' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "המר:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "אל:"
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr ""
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
 msgstr ""
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "הכנס רווח לפני אות גדולה"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "מחק רווחים או קוים תחתיים כפולים"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4632,183 +4698,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "מקרא"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : אומן"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : אומן"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : אלבום"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : הערה"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : מלחין"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : זכויות"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : מספר דיסק"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : מקודד ע\"י"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ז'אנר"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignored"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : מספר הרצועות"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : אומן מקורי"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : רצועה"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : כותרת"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : אתר"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : שנה"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "עורך מסכות"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "צור מסכה חדשה"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "הזז מסכה זו למעלה"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "הזז מסכה זו למטה"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "שכפל מסכה"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "הוסף מסכות ברירת מחדל"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "מחק מסכה"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "שמור מסכות"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr ""
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "העתקה: לא נבחרה שורה!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "מחיקה: לא נבחרה שורה!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "העלה: לא נבחרה שורה!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "הורד: לא נבחרה שורה!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "שגיאה: לא ניתן לכתוב לקובץ ההגדרות: %s (%s)\a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "לא ניתן לפתוח קובץ הגדרות  '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "מעלה הגדרות ברירת מחדל..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "לא ניתן ליצור או לפתוח קובץ '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "שגיאה: לא ניתן לכתוב רשימה לקובץ: %s (%s)\a"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "מעלה את מסכות ברירת המחדל למילוי תגים..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "מעלה את מסכות ברירת המחדל לשינוי שמות קבצים..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "מעלה את מסכות ברירת המחדל לשינוי תיקייה..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "שגיאה: משתנה הסביבה HOME אינו מוגדר"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "שגיאה: לא ניתן ליצור תיקייה '%s' (%s)!"
diff --git a/po/hu.gmo b/po/hu.gmo
index 4b41dd2..222868a 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 5a32099..b3959c8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 914hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-10-24 22:59+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <hu at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,6 +33,7 @@ msgstr ""
 "Mészáros Csaba <csablak at freemail.hu>"
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Német fordítás)"
 
@@ -111,137 +113,137 @@ msgstr "(Héber fordítás)"
 msgid "(Serbian translation)"
 msgstr "(Szerb fordítás)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "Kiterjesztés neve"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "Helyzet"
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Megjegyzés"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Névjegy..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Névjegy"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Készült: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Szerző: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Honlap: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Leírás:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "Kiterjesztés"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "MP3 fájl támogatás"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "elérhető"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "nem elérhető"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "ID3v2.3 címkék támogatása"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "elérhető"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Ogg Vorbis fájl támogatás"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Speex fájl támogatás"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "FLAC fájl támogatás"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "MP4/AAC fájl támogatás"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "WavPack fájl támogatás"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Köszönet"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Fordítások:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Általános:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Módosítások"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "'%s' (%s) fájl megnyitása sikertelen!\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Hiba a '%s' (%s) fájl megnyitása közben."
@@ -250,551 +252,561 @@ msgstr "Hiba a '%s' (%s) fájl megnyitása közben."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "Fájl"
 
 # Fájl menü
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Lista rendezése címkemezők szerint"
 
 # Fájl menü
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Lista rendezése tulajdonság szerint"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Fájlnév szerint növekvően"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Fájlnév szerint csökkenően"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Létrehozás időpontja szerint növekvően"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Létrehozás időpontja szerint csökkenően"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Sorszám szerint növekvően"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Sorszám szerint csökkenően"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Cím szerint növekvően"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Cím szerint csökkenően"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Előadó szerint növekvően"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Előadó szerint csökkenően"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Előadó szerint növekvően"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Előadó szerint csökkenően"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Album szerint növekvően"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Album szerint csökkenően"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Év szerint növekvően"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Év szerint csökkenően"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Műfaj szerint növekvően"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Műfaj szerint csökkenően"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Megjegyzés szerint növekvően"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Megjegyzés szerint csökkenően"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Szerző szerint növekvően"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Szerző szerint csökkenően"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Eredeti előadó szerint növekvően"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Eredeti előadó szerint csökkenően"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Kiadó szerint növekvően"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Kiadó szerint csökkenően"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "URL szerint növekvően"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "URL szerint csökkenően"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Kódoló neve szerint növekvően"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Kódoló neve szerint csökkenően"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Fájltípus szerint növekvően"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Fájltípus szerint csökkenően"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Fájlméret szerint növekvően"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Fájlméret szerint csökkenően"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Időtartam szerint növekvően"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Időtartam szerint csökkenően"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Bitráta szerint növekvően"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Bitráta szerint csökkenően"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Minőség szerint növekvően"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Minőség szerint csökkenően"
 
 # Fájl menü
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Megnyitás ezzel..."
 
 # Fájl menü és bubble help egyben!
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Minden fájl kijelölése"
 
 # Fájl menü és bubble help egyben
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Kijelölés megszüntetése"
 
 # Fájl menü
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Kijelölés megfordítása"
 
 # Fájl menü
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Fájlok törlése"
 
 # Fájl menü
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "Első fájl"
 
 # ikon megjegyzés
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Első fájl"
 
 # Fájl menü
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Előző fájl"
 
 # ikon megjegyzés
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Előző fájl"
 
 # Fájl menü
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "Következő fájl"
 
 # ikon megjegyzés
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Következő fájl"
 
 # Fájl menü
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "Utolsó fájl"
 
 # ikon megjegyzés
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Utolsó fájl"
 
 # Fájl menü
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "Fájlok feldolgozása"
 
 # ikon megjegyzés
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Módosítások beillesztése, a kijelölt helyekre."
 
 # Fájl menü
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "Címkék eltávolítása"
 
 # ikon megjegyzés
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Címkék eltávolítása"
 
 # Fájl menü
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "Fájlmódosítások visszavonása"
 
 # Fájl menü
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Fájlmódosítások visszavonása"
 
 # Fő menü
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "Fájlmódosításokat mégis"
 
 # ikon megjegyzés
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Fájlmódosításokat mégis"
 
 # Fő menü
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "Fájlok mentése"
 
 # ikon megjegyzés
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Fájlok mentése"
 
 # Fájl menü
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "Fájlok kényszerített mentése"
 
 # ikon megjegyzés
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Fájlok kényszerített mentése"
 
 # Fájl menü
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Utolsó változtatást vissza"
 
 # ikon megjegyzés
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Utolsó változtatást mégis"
 
 # Fő menü
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "Kilépés"
 
 # ikon megjegyzés
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Kilépés"
 
 # Menüsor
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "Böngésző"
 
 # Böngésző menü
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Ugrás a kezdő könyvtárra"
 
 # ikon megjegyzés
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Ugrás a kezdő könyvtárra"
 
 # Ikon megjegyzés
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Ugrás az alapértelmezett könyvtárra"
 
 # ikon megjegyzés
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Ugrás a kezdő könyvtárra"
 
 # ikon megjegyzés
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Ugrás a kezdő könyvtárra"
 
 # ikon megjegyzés
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Ugrás a kezdő könyvtárra"
 
 # Böngésző menü
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Ugrás az alapértelmezett könyvtárra"
 
 # Ikon megjegyzés
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Ugrás az alapértelmezett könyvtárra"
 
 # Böngésző menü
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Aktuális könyvtár alapértelmezetté tétele"
 
 # ikon megjegyzés
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Aktuális könyvtár alapértelmezetté tétele2"
 
 # böngésző menü
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Fastruktúra nézet | Előadó-Album nézet"
 
 # böngésző menü
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Könyvtár átnevezése..."
 
 # böngésző menü
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Könyvtár újratöltése"
 
 # böngésző menü
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Könyvtár böngészés külső programmal..."
 
 # böngésző menü
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "Könyvtárfát bezár"
 
 # böngésző menü
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "Könyvtárfát frissít"
 
 # Menüsor
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "Feldolgozó"
 
 # feldolgozó menü
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "Mezők kitöltése..."
 
 # ikon megjegyzés
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Mezők kitöltése"
 
 # feldolgozó menü
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "Átnevezés..."
 
 # ikon megjegyzés
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Átnevezés..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "Mezöfeldolgozás..."
 
 # feldolgozó menü
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Mezöfeldolgozás..."
 
 # Menüsor
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "Egyéb"
 
 # egyéb menü
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Fájl keresése..."
 
 # ikon megjegyzés
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Fájl keresése..."
 
 # egyéb menü
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "CDDB keresés..."
 
 # ikon megjegyzés
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB keresés..."
 
 # egyéb menü
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Fájlnevek betöltése TXT-ből..."
 
 # egyéb menü
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "M3u listafájl írása..."
 
 # egyéb menü
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Zene lejátszó futtatása"
 
 # Menüsor
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "Beállítások"
 
 # beállítások menü
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "Tulajdonságok..."
 
 # ikon megjegyzés
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Tulajdonságok..."
 
 # Menüsor
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "Súgó"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "Névjegy"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Folyamatban levő művelet megszakítása"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "Fájlnév beállítások"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Fájl keresése CDDB adatbázisban..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Információk törlése"
 
 # böngésző menü
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Alkönyvtárak böngészése"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Rejtett könyvtárak megjelenítése"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Fastruktúra nézet / Előadó és Album nézet"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Összevonás nem lehetséges %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Futtatásra kész..."
 
@@ -803,7 +815,7 @@ msgid "New default path for files selected"
 msgstr "Új alapértelmezett könyvtár kiválasztva"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Figyelem..."
 
@@ -815,87 +827,92 @@ msgstr ""
 "Néhány fájl megváltozott\n"
 "Szeretné menteni a változásokat?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Minden albums>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Hiba a kereséskor: %s nem található %s útvonalon."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Fastruktúra"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Fájl neve"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Cím"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Előadó"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Év"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Sáv"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Szerző"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Eredeti előadó"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Kiadó"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Kódoló"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Albumok"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Fájlok"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Ugrás a szülő könyvtárba"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Adja meg az átvizsgálandó könyvtárat."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Adja meg az átvizsgálandó könyvtárat!"
@@ -903,35 +920,35 @@ msgstr "Adja meg az átvizsgálandó könyvtárat!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u fájl"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Előadó & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Könyvtár átnevezése"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "%s - könyvtár átnevezése"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Használandó maszk :"
 
 # bubblehelp
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ha aktíválja, a könyvtár a beállított maszkkal lesz átnevezve."
 
 # bubblehelp
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -939,31 +956,31 @@ msgstr ""
 "Válassza ki a megfelelő maszkot, vagy írjon egy újat a könyvtár "
 "átnevezéséhez."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Hibás feldolgozómaszk"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Könyvtár átnevezés előnézet..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Hiba!"
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Meg kell adnia a könyvtár nevét!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -997,7 +1014,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -1006,7 +1023,7 @@ msgstr ""
 "Az átnevezés sikertelen. Ez a név már létezik!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -1020,106 +1037,106 @@ msgstr ""
 "Erre: '%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Könyvtár átnevezve"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Futtatandó program:"
 
 # bubble help?
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Adja meg a futtatandó programot. Az aktuális könyvtárat fogja megkapni "
 "paraméterként."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Megnyitás ezzel..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Adja meg a futtatandó programot. Az aktuális fájlt fogja megkapni "
 "paraméterként."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Meg kell adnia a program nevét!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "A %s program nem található!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "'%s'-t nem lehet futtatni. %d hiba!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Egy másik folyamatot nem sikerült leválasztani!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "A futtatott parancs : '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Előadó / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Kategória"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Sáv neve"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Időtartam"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "CDDB keresés"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatikus keresés"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "CD adatbázis lekérése:"
 
 # bubble help
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
 msgstr "Az automatikus kereséshez szükség van egy adatbázis szerverre."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Keresés leállítása"
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Helyi Cddb adatbázis használata"
 
 # bubble help
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1130,139 +1147,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Kézi keresés"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Keresendő elem:"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Írja be a keresendő eleme(ke)t szóközzel elválasztva egymástól."
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Ahol keres:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Minden mezőben"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Egyéb"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Minden kategóriában"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klasszikus"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Új hullám"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Filmzene"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "beleértve a funk, soul, rap, pop, industrial, metal, stb műfajokat is."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "filmek, tv műsorok"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "egyéb fel nem sorolt kategóriák is."
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Kategóriák"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Eredmények"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Keresendő elem:"
 
 # bubble help
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Írja be a keresendő elemet."
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Lefelé keres"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Felfelé keres"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Csak a piros sorokat (vagy minden sort) az Előadó / Album listában"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Kijelölés megszüntetése"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Minden sor kijelölése"
 
 # bubble help
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1274,36 +1291,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Lekérés tartalma"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "MInden mező"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Sáv #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Sáv"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Az aktuális feldolgozó futtatása a kijelölt fájlokon"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Levenshtein algoritmus féle összehasonlítás"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1317,91 +1334,95 @@ msgstr ""
 "kiválasztásánál és a cddb eredmények alkalmazásakor a direkt pozíció sorrend "
 "helyett is ezt fogja használni."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Kijelölt sorok betöltése. (Ha nincs kjelölés mind betöltődik)"
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Keresésre kész..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Album: '%s', előadó: '%s', hossz: '%s', év: '%s', műfaj: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Lista rendezése sorszám szerint"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Rendezés név szerint"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "%s név feloldása"
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "'%s' (%s) névfeloldása sikertelen!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "(%s) létrehozása sikertelen!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Kapcsolódás ide '%s', port '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Sikertelen kapcsolódás a '%s' (%s) helyhez!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Kapcsolódás a %s szerverhez"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Adatok fogadása (%s)"
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Hibás válasz a (%s) cddb lehívásakor!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "A '%s' (%s) fájl létrehozása sikertelen."
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "'%s' (%s) fájl megnyitása sikertelen!"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Kérés küldése"
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "(%s) kérés küldése sikertelen!"
@@ -1410,90 +1431,91 @@ msgstr "(%s) kérés küldése sikertelen!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Adatok fogadása..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "A szerver hibás választ küldött!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "A szerver (%s) hibás választ küldött!"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Sajnáljuk, de a web-bázisú kereső jelenleg nem működik!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d darab egyező albumot találtam."
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Adatok fogadása (%d) (album %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Adatok fogadása (%d)"
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "További eredmények letöltése"
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Nincs kijelölt fájl!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Több mint 99 fájl van kijelölve! A kérés elküldése nem lehetséges!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fájl kijelölve!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Keresés a CD-n..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 #, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr "Az útvonal a Helyi CD adatbázishoz nincs beállítva!"
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Adatküldés szükséges (CddbId: %s, #sáv: %d, Lemez hossz: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d darab egyező albumot találtam for DiscID '%s'"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "'%s' (%s) fájl megnyitása sikertelen!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Az album számcímeinek betöltése ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1506,7 +1528,7 @@ msgstr ""
 "\n"
 "Folytatja?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Címke írása CDDB-ből..."
 
@@ -1808,7 +1830,7 @@ msgstr "Ismeretlen paraméter, vagy útvonal %s \n"
 msgid "Browser"
 msgstr "Böngésző"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Fájl"
 
@@ -1822,11 +1844,11 @@ msgstr "Hibás fájlhivatkozás"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Réteg ?"
 
@@ -1834,7 +1856,7 @@ msgstr "?, Réteg ?"
 msgid "Bitrate:"
 msgstr "Bitérték:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1842,17 +1864,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frekvencia:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mód:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1869,7 +1891,7 @@ msgid "Time:"
 msgstr "Hossz:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "ID3 címkék"
 
@@ -1904,40 +1926,54 @@ msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott előadóval"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Előadó:"
+
+# bubble help
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr ""
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott előadóval"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album neve:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott albumnévvel"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott CD lemez számmal"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Év:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott évszámmal"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Pici gomb megnyomása:\n"
@@ -1945,11 +1981,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Sorszám #;"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1957,29 +1993,29 @@ msgstr ""
 "Pici gomb megnyomása:\n"
 "A könyvtárban található fájlok számának automatikus megadása"
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott számmal"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Műfaj:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott műfajjal"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr ""
 "Pici gomb megnyomása:\n"
@@ -1988,55 +2024,55 @@ msgstr ""
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Szerző:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott szerzővel "
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Eredeti előadó:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott Eredeti előadóval"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Kiadó:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott kiadóval"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott URL-lel"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Kódoló:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr ""
 "Pici gomb megnyomása:\n"
@@ -2045,219 +2081,228 @@ msgstr ""
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Képek"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Képek:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Csak fogja meg és húzza bele a képet."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr ""
 "Pici gomb megnyomása:\n"
 "A kijelölt fájlok megcímkézése a megadott képpel"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Kép hozzáadása. (Húzd és ejtsd funkció)"
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 "A kijelölt kép eltávolítása. Ha nem jelöl ki semmit, minden kép törlődik."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Kijelölt kép(ek) mentése a merevlemezre."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Kép jellemzői"
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Minden fájl megcímkézve a megadott %s címmel."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Mű címe mező törölve."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott %s előadóval"
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Előadó mező törölve"
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "A kijelölt fájlok megcímkézve a megadott %s előadóval"
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Előadó mező törölve"
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' albummal"
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Album neve mező törölve"
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "A kijelölt fájlok megcímkézve a '%s' CD lemez számmal"
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "CD lemez szám mező törölve"
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' évvel"
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Év mező törölve"
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott számozással mint 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "A kijelölt fájlok megcímkézve a megadott számozással mint 'xx'"
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Sorszám mező törölve"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "A kijelölt sávok növekvően sorszámozva."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' műfajjal."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Műfaj mező törölve"
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "A kijelölt fájlok megcímkézve a '%s' megjegyzéssel."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Megjegyzés mező törölve"
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' szerzővel"
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Szerző mező törölve"
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s'. Eredeti előadóval"
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Az Eredeti előadó mező törölve"
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' kiadóval"
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "A Kiadó mező törölve"
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' URL-lel"
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Az URL mező törölve"
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' kódolóval"
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "A Kódoló mező törölve"
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "A kijelölt fájlok megcímkézve a megadott '%s' képpel"
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "A Képek mező törölve"
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Válasszon módot és maszkot, és ismételje meg"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Minden címke feldolgozva"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Minden címke törölve"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
 # ikon megjegyzés
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Fájl keresése..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Minden fájl elmentve..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Fájlok részben törölve..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Minden fájl törölve..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2266,16 +2311,16 @@ msgstr ""
 "Beírja a címkét ebbe a fájlba: \n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Címke írása..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Átnevezés"
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2288,11 +2333,11 @@ msgstr ""
 "erre: '%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Könyvtár átnevezése..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2305,11 +2350,11 @@ msgstr ""
 "erre: '%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Fájl átnevezése..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2321,17 +2366,17 @@ msgstr ""
 "'%s' fájlt\n"
 "erre: '%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "'%s' címkéjének írása"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Címkék kiírva"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2340,21 +2385,21 @@ msgstr ""
 "A címkék nem írhatók ebbe a fájlba: '%s'!\n"
 "(Nem %s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "A címkék nem írhatók ebbe a fájlba: '%s'!\n"
 "(Nem %s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "'%s' fájl átnevezése"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2366,7 +2411,7 @@ msgstr ""
 "erre: '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2374,11 +2419,11 @@ msgstr ""
 "erre: '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Nem történt átnevezés..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2391,7 +2436,7 @@ msgstr ""
 ", mert ilyen nevű fájl már létezik:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2400,7 +2445,7 @@ msgstr ""
 ", mert ilyen nevű fájl már létezik:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2411,7 +2456,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2420,16 +2465,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Fájl átnevezve '%s'-ról '%s'-re"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Fájlok átnevezve..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2439,7 +2484,7 @@ msgstr ""
 "'%s'\n"
 "(%s) könyvtár törlése sikertelen!"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2447,17 +2492,17 @@ msgstr ""
 "(%s) könyvtár törlése sikertelen!"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Fájl átnevezve '%s'-ról '%s'-re"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Fájlok átnevezve..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2469,7 +2514,7 @@ msgstr ""
 "erre: '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2477,11 +2522,11 @@ msgstr ""
 "erre: '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Nem történt átnevezés..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2490,16 +2535,16 @@ msgstr ""
 "Véglegesen törölni kívánja a(z) \n"
 "'%s' fájlt?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Fájl törlése..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "'%s' fájl törölve"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2510,109 +2555,108 @@ msgstr ""
 "(%s)könyvtár nem olvasható."
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Beolvasás..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Fájl: %s"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "'%d' db fájl található ebben a könyvtárban és alkönyvtáraiban."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "'%d' db fájl található ebben a könyvtárban."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fájl"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nem található fájl ebben a könyvtárban és alkönyvtáraiban."
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Nem található fájl ebben a könyvtárban!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Betöltés"
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "Betöltés leállítása"
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Adja meg az átvizsgálandó könyvtárat!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "A kijelölt fájlok megcímkézve a megadott mezőkkel"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Szóköz alsóvonássá alakítása"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "MINDENT NAGYBETÅ°SRE"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "mindent kisbetűsre"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Első betű legyen nagybetű"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Minden Szó Első Betűje Legyen Nagybetű"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Szóközök eltávolítása"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Szóköz minden nagybetű elé"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Minden dupla szóköz és alsóvonás eltávolítása"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: rendellenes kilépés! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "%s (%d) szignál vétele!\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2623,11 +2667,11 @@ msgstr ""
 "el)\n"
 "<easytag at gmail.com> címre."
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Ismeretlen szignál"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2660,11 +2704,11 @@ msgstr ""
 "elérési_útvonal/a_fájlokhoz.  Relatív útvonal használata.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normális kilépés."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2672,83 +2716,83 @@ msgstr ""
 "Néhány fájl megváltozott\n"
 "Szeretné menteni a változásokat?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Biztosan ki akar lépni? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 címkék"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis címkék"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis címkék"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE címkék"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC címkék"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "WavPack címke"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 fájl"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 fájl"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis fájl"
 
 # ikon megjegyzés
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex fájl"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC fájl"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack fájl"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio fájl"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC fájl"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "WavPack fájl"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Képek (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2756,14 +2800,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2774,11 +2818,11 @@ msgstr ""
 "(Próbálja meg a környezetet variálni:\n"
 " G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Fájlnév fordítások (?)"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "A %s'fájlnév %d karakterek miatt csonkitott lesz!\n"
@@ -2802,54 +2846,54 @@ msgstr "Kódoló:"
 msgid "Channels:"
 msgstr "Csatornák:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "Hiba a '%s' mint FLAC (%s) fájl megnyitása közben."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "HIBA: A megjegyzés írása közben a(z) '%s' (%s) fájlba."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "'%s' címkéje kiírva"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "'%s' fájl címkéje eltávolítva"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Hiba a(z) '%s' (%s) fájl ID3v1 címkéjének eltávolításakor"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Hiba a(z) '%s' (%s) fájl ID3v2 címkéjének eltávolításakor"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Hiba a(z) '%s' (%s) fájl ID3v2 címkéjének frissítésekor"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2874,77 +2918,77 @@ msgstr ""
 "\n"
 "File : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Hiba a(z) '%s' (%s) fájl ID3v1 címkéjének frissítésekor"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "'%s' címkéje frissítve"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Nem történt hiba"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Nincs elég memória"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Nincs feldolgozandó adat"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Hibás formátumú adat"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Nincs írható puffer"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "A puffer túl kicsi"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Hibás formátum azonosító"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "A keresett fájl nem található"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Ismeretlen mezőtípus"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Ennek a fájlnak már van címkéje"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Hibás ID3 címke verzió"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Nincs feldolgozandó fájl"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Megpóbál csak olvasható fájlba írni"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Hiba a be/kitömörítés közben"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Ismeretlen hiba!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2953,7 +2997,7 @@ msgstr ""
 "Ez egy hibás formátumú fájl: '%s'\n"
 "Az id3lib által nem értelmezhető címkék miatt a feldolgozás meghiúsul."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Hibás fájl..."
 
@@ -2961,74 +3005,74 @@ msgstr "Hibás fájl..."
 msgid "Log"
 msgstr "Információk "
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Fájl kiválasztása..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Könyvtár kiválasztása..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Figyelem..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Nincs audió lejátszó beállítva"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "'%s' (%s)-t nem lehet futtatni!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "M3u listafájl készítés"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3u listafájl neve"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Könyvtár nevének használata"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Maszkok szerkesztése"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "M3u listafájl beállítások"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Csak a kijelölt fájlokat tartalmazza"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -3036,31 +3080,31 @@ msgstr ""
 "Ha aktíválja, csak a kijelölt fájlok lesznek az M3u listafájlban.Egyébként "
 "minden fájl belekerül."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Teljes elérési út használata az M3u listában"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Relatív elérési út használata az M3u listában"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "M3u listafájl írása a szülő könyvtárba"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Ha aktíválja, az M3u listafájl a szülő könyvtárban kerül létrehozásra. "
 "(Tehát nem abba amiben éppen dolgozunk, hanem eggyel feljebb)"
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Dos-Windows féle könyvtár elválasztó használata"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -3068,23 +3112,23 @@ msgstr ""
 "Ez az opció lecseréli az UNIX könyvtáraknál használatos '/' "
 "könyvtárválasztót a DOS-Windows-nál alkalmazott '\\' könyvtárválasztóra"
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "M3u listafájl tartalma"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Csak lista készítése a fájlokról"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Információ írás a fájlnevet használva"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Információ írás ezt a maszkot használva:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -3093,12 +3137,12 @@ msgstr ""
 "'%s' listafájl már létezik!\n"
 "Felülírja?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "M3u listafájl írása..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -3107,112 +3151,112 @@ msgstr ""
 "A '%s' listafájl írása sikertelen!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "'%s' listafájl elkészült"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Kódoló"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Fájlkeresés"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 "Írja be a keresendő szót vagy ne írjon be semmit, és minden fájl látható lesz"
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "Hol keressen?"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "fájlnévben"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "címkében"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "kis és NAGYBETŰK megkülönböztetése"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "%d darab találat"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Fájlnevek betöltése TXT fájlból"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Fájl:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Betölt "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "TXT fájl tartalom"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "Üres hely beszúrása a kijelölt vonal elé"
 
 # Sor törlése - volt régen.
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "Kijelölt vonal törlése"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Minden üres sor törlése"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "Kijelölt sor felljebb mozgatása"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "Kijelölt sor lejjebb mozgatása"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Újratöltés"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "Fájllista"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "Kijelölt sor:"
 
 # bubble help
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3221,19 +3265,19 @@ msgstr ""
 "aktuális beállításaival íródnak felül.\n"
 "(A feldolgozóablak most nyitva)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Üres sor beszúrása"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Sor törlése"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "Aktuális sor felfelé mozgatása"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "Aktuális sor lefelé mozgatása"
 
@@ -3316,12 +3360,12 @@ msgid ""
 msgstr ""
 "Ogg Vorbis: Belső logikai hiba, ez mutatja a verem hibáját. (fájl: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "HIBA: '%s' (%s) fájl vorbisként való megnyitásakor."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Figyelem: Az Ogg Vorbis fájl '%s' ID3v2 címkét tartalmaz."
@@ -3932,7 +3976,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "A rendszerkódolás használata, és a nem megfelelő karakterek átírása"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3948,7 +3992,7 @@ msgid ""
 "characters"
 msgstr "A rendszerkódolás használata, és a nem megfelelő karakterek eldobása"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -4105,23 +4149,34 @@ msgstr "Tömörítés"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "ID3v2 címke tömörítésének beállítása"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Karakterkészlet az ID3 címkék ÍRÁSÁHOZ"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2.x címkék"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "ID3v2.x címke írása"
 
 # bubble help
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -4131,11 +4186,11 @@ msgstr ""
 "Ellenkező esetben a címkemezők tartalma törlődik."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Verzió:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4147,37 +4202,37 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Kódolás:"
 
 # src/trans.h:267
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Unicode típus"
 
 # bubble help
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 "A címkeadatok ÍRÁSÁRA használt karakterkészlet a felhasználói felületen."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "További beállítások az iconv() segítségével:"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Nem"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4188,26 +4243,26 @@ msgstr ""
 "található meg az adott karakter, akkor 1 vagy több hasonló formájú karaktert "
 "próbál beilleszteni helyette."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//ÁTÍR"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//KIHAGY"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1 címkék"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "ID3v1.x címke írása"
 
 # bubble help
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4217,30 +4272,30 @@ msgstr ""
 "Ellenkező esetben a címkemezők tartalma törlődik."
 
 # bubble help
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 "A címkeadatok ÍRÁSÁRA használt karakterkészlet a felhasználói felületen."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Karakterkészlet az ID3 címkék OLVASÁSÁHOZ"
 
 # Jerome - this is not standard?
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Nem szabvány:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4250,7 +4305,7 @@ msgid ""
 msgstr "Ezen karakterkódolás használata a címke olvasásához"
 
 # bubble help
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "A címkeadatok OLVASÁSÁRA használt karakterkészlet a felhasználói felületen."
@@ -4258,55 +4313,55 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Feldolgozó"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Címkemezők kitöltése - Karakterkonverzió"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Szóköz alsóvonássá alakítása"
 
 # bubble help
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr "A megadott konvertálás automatikusan végrehajtódik."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Átnevezés - Karakterkonverzió"
 
 # bubble help
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr "A megadott konvertálás automatikusan végrehajtódik."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Feldolgozó - Karakterkonverzió"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Ne kezdje nagybetűvel a cikkek és az előtagok első szavát."
 
 # bubble help
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4317,44 +4372,44 @@ msgstr ""
 "feldolgozó 'Minden szó első betűje legyen nagybetű' opciója be van kapcsolva."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Feldolgozóablak"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Feldolgozóablak megnyitása indításkor"
 
 # bubble help
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "Feldolgozóablak megnyitása indításkor"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Feldolgozóablak mindig felül"
 
 # bubble help
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr "Feldolgozóablak mindig felül"
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Mezők"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Mezők felülírása a címkék feldolgozásakor"
 
 # bubble help
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4362,12 +4417,12 @@ msgstr ""
 "Ha ki van választva, a feldolgozáskor a mezők felülíródnak.\n"
 "Ha nincs kiválasztva, akkor csak az üres mezők kitöltése engedélyezett."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Ez a szöveg az alapértelmezett 'megjegyzés':"
 
 # bubble help
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4376,11 +4431,11 @@ msgstr ""
 "'megjegyzés' mező a megadott szöveggel."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "CRC32 ellenőrző kód írása alapértelmezett 'megjegyzés'-ként "
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4391,42 +4446,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD adatbázis"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Szerver beállítások az Automatikus kereséshez"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Név:"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port:"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI elérési út:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Szerver beállítások a manuális kereséshez"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Helyi CD adatbázis"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Útvonal:"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4439,56 +4494,56 @@ msgstr ""
 "stílusokról."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Proxy beállítás"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Proxy használata"
 
 # bubble help
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Proxy beállítások aktiválása."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Gépnév:"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Proxy szerver neve."
 
 # bubble help
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Proxy szerver portja."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Felhasználó neve:"
 
 # bubble help
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "A felhasználó neve a proxy szerveren."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Felhasználó jelszava:"
 
 # bubble help
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "A proxy szerver felhasználójának jelszava."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Sáv neve"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4496,7 +4551,7 @@ msgstr ""
 "A megfelelő audio fájl kiválasztása (pozíció szerint vagy DLM használatával, "
 "ha az aktiválva van)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4505,7 +4560,7 @@ msgstr ""
 "listában is kiválasztásra kerül a megfelelő fájl. "
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4516,75 +4571,79 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Megerősítés"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Programból való kilépés megerősítése"
 
 # bubble help
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "Programból való kilépés megerősítése"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Címke írásának megerősítése"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Fájl átnevezésének megerősítése"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Fájl törlésének megerősítése"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "M3u listafájl írásának megerősítése"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr ""
 "Változtatások életbe léptetése (de nem mentése!), majd az ablak bezárása"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Ablak bezárása mentés nélkül"
 
 # bubble help
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Változtatások mentése, majd az ablak bezárása"
 
 # not necessary hungarian. I do not understand.
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Például : %.*d - fájlnév.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "A változások életbe léptek"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Beállítások elmentve"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "A beállítások nem változtak"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4595,37 +4654,37 @@ msgstr ""
 "'%s'\n"
 " (%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Nem könyvtár"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "A '%s' zene lejátszó nem található!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Mezők kitöltése"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Átnevezés"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Mezöfeldolgozás"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Címke sikeresen feldolgozva..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Címke sikeresen feldolgozva...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4633,21 +4692,21 @@ msgstr ""
 "Címke keresés: meglepő..., a %s kiterjesztés alapján nem találom a %s fájl "
 "nevet!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Hiba a feldolgozáskor: nem található a '%s' elválasztó '%s'-ben"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "A %s fájl átkonvertálása nem lehetséges ebben a rendszerben"
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Új fájlnév sikeresen feldolgozva..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Új fájlnév sikeresen feldolgozva...(%s)"
@@ -4655,42 +4714,42 @@ msgstr "Új fájlnév sikeresen feldolgozva...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Címke és fájlnév feldolgozás"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Feldolgozó: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Feldolgozótípus választása"
 
 # bubble help
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Feldolgozó ablak megnyitása / Kijelölt fájlok feldolgozása"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Feldolgozó beállításai"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Maszkszerkesztőt mutat/rejt"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Puskát mutat/rejt"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4698,16 +4757,16 @@ msgstr ""
 "Válassza ki a megfelelő maszkot, vagy írjon egy újat a címkék kitöltéséhez."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Előnézet"
 
 # bubble help
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Kitöltés a megadott maszkkal"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4717,16 +4776,16 @@ msgstr ""
 "Válassza ki a megfelelő maszkot, vagy írjon egy újat a címkék kitöltéséhez."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Fájlátnevezés előnézet..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Mezők kijelölése:"
 
 # bubble help
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4734,189 +4793,200 @@ msgstr ""
 "Az itt látható gombok közül jelölje ki azokat melyeket szükségesnek tart."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
 # bubble help
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Fájlnév mező feldolgozása"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
 # bubble help
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Mű címe mező feldolgozása"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
 # bubble help
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Előadó mező feldolgozása"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+# bubble help
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Előadó mező feldolgozása"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
 # bubble help
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Album neve mező feldolgozása"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
 # bubble help
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Műfaj mező feldolgozása"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
 # bubble help
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Megjegyzés mező feldolgozása"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
 # bubble help
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Szerző mező feldolgozása"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
 # bubble help
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Eredeti előadó mező feldolgozása"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
 # bubble help
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Kiadó mező feldolgozása"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
 # bubble help
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "URL mező feldolgozása"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
 # bubble help
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Kódoló mező feldolgozása"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Kijelölés/Kijelölés megforditása - mindenhol"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Karaktercsere ezt:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "ebbe: "
 
 # bubble help
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
 # bubble help
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr "A szóköz karakterek alsóvonássá alakítása"
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr "Cserélje le a szöveget valami másra, és figyeljen a betűérzékenységre."
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
 # bubble help
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr "MINDEGYIK KARAKTERT NAGYBETŰSRE CSERÉLI"
 
 # bubble help
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr "mindegyik karaktert kisbetűsre cseréli"
 
 # bubble help
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
 msgstr "Csak a legelső karaktert cseréli nagybetűsre"
 
 # bubble help
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
 msgstr "Minden Szó Első Betűjét Nagybetűsre Cseréli"
 
 # bubble help
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4925,16 +4995,16 @@ msgstr ""
 "Szóköz beillesztése minden nagybetűs karakter elé.\n"
 "Példa: 'SzövegAKijelöltablakban' --> 'Szöveg A Kijelöltablakban'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Szóköz beszúrása minden NAGYBETŰS szó elé"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Dupla szóközök, és alsóvonások törlése"
 
 # bubble help
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4943,7 +5013,7 @@ msgstr ""
 "Példa: 'Szöveg a kijelölt ablakban' --> 'Szövegakijelöltablakban'"
 
 # bubble help
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4952,7 +5022,7 @@ msgstr ""
 "Példa: 'SzövegAKijelöltablakban' --> 'Szöveg A Kijelöltablakban'."
 
 # bubble help
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4964,183 +5034,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Puska"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : előadó"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : előadó"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : megjegyzés"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : szerző"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : kiadó"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : CD lemez száma"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : kódoló"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : műfaj"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : mellőzött"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : sávok száma"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : Eredeti előadó"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : sorszám"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : cím"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : év"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Maszkszerkesztő"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Új maszk"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Maszk felfelé mozgatása"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Maszk lefelé mozgatása"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Maszk kétszerezése"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Alapmaszkok hozzáadása"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Maszk eltávolítása"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Maszkok mentése"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Új maszk"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Másolás: Nincs kijelölt sor!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Eltávolítás: Nincs kijelölt sor!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Felfelé mozgatás: Nincs kijelölt sor!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Lefelé mozgatás: Nincs kijelölt sor!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "HIBA: A konfigurációs fájl nem írható %s (%s)a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "A konfigurációs fájl megnyitása sikertelen '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Alapértelmezett beállítások betöltése..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "'%s' (%s)-t megnyitása sikertelen"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "HIBA: A lista nem írható %s (%s) fájlba"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Alapértelmezett Címke kitöltés maszkok betöltése..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Alapértelmezett fájl átnevező maszkok betöltése..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Alapértelmezett könyvtár átnevező maszkok betöltése..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "HIBA: A Kezdő könyvtár környezeti változója nincs definiálva!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "HIBA: Nem lehet létrehozni a '%s'(%s) könyvtárat!"
diff --git a/po/it.gmo b/po/it.gmo
index 38324b2..e515d07 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 2c27ce0..5d0367b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-2.0.2it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-05-04 19:37+0200\n"
 "Last-Translator: Kostantino <ciclope10ATalice.it>\n"
 "Language-Team: italiano <it at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,6 +33,7 @@ msgstr ""
 "etichette in ambiente GNU/Linux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(traduzione tedesca)"
 
@@ -114,111 +116,111 @@ msgstr "(traduzione greca)"
 msgid "(Serbian translation)"
 msgstr "(traduzione tedesca)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Commento"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Informazioni..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Informazioni"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilato il: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d e id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autore: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "Posta elettronica: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Pagina web: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Descrizione:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Non c'è più memoria disponibile"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(il supporto per i file Ogg Vorbis è stato disabilitato)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(il supporto per i file FLAC è stato disabilitato)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(il supporto per i file MP4/AAC è stato disabilitato)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
@@ -226,33 +228,33 @@ msgstr "(il supporto per i file MP3 è stato disabilitato)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Ringraziamenti"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Traduzioni:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Generale:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Modifiche"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Non posso aprire il file '%s' (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Si è verificato un errore aprendo il file '%s' (%s)."
@@ -260,484 +262,494 @@ msgstr "Si è verificato un errore aprendo il file '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_File "
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Ordina la lista per etichetta"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Ordina la lista per proprietà"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Crescente per nome file"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Decrescente per nome file"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Crescente per data di creazione"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Decrescente per data di creazione"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Crescente per numero di traccia"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Decrescente per numero di traccia"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Crescente per titolo"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Decrescente per titolo"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Crescente per artista"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Decrescente per artista"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Crescente per artista"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Decrescente per artista"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Crescente per album"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Decrescente per album"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Crescente per anno"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Decrescente per anno"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Crescente per genere"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Decrescente per genere"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Crescente per commento"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Decrescente per commento"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Crescente per compositore"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Decrescente per compositore"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Crescente per artista originale"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Decrescente per artista originale"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Crescente per diritti d'autore"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Decrescente per diritti d'autore"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Crescente per URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Decrescente per URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Crescente per nome codificatore"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Decrescente per nome codificatore"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Crescente per tipo file"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Decrescente per tipo file"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Crescente per dimensione file"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Decrescente per dimensione file"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Crescente per durata"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Decrescente per durata"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Crescente per bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Decrescente per bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Crescente per campionamento"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Decrescente per campionamento"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Apri file con..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Seleziona tutti i file"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Deseleziona tutti i file"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Inverti la selezione dei file"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Cancella file"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Primo file"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Primo file"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "File _precedente"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "File precedente"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "File _successivo"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "File successivo"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Ultimo file"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Ultimo file"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "Proc_essa  file"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Processa  file"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Rimuovi etichette"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Rimuovi etichette"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Annulla le modifiche all'ultimo file"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Annulla le modifiche all'ultimo file"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "Rip_eti le modifiche all'ultimo file"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Ripeti le modifiche all'ultimo file"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Salva file"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Salva file"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "_Forza salvataggio file"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Forza il salvataggio dei file"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Annulla le ultime modifiche"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Ripeti le ultime modifiche"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Esci"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Esci"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Navigatore"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Vai alla cartella _home"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Vai alla cartella home"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Vai alla cartella predefinita"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Vai alla cartella home"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Vai alla cartella home"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Vai alla cartella home"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Vai alla cartella pre_definita"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Vai alla cartella predefinita"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Imposta il percorso _corrente come predefinito"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Imposta il percorso corrente come predefinito"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Vista ad albero | Vista artista - album"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Rinomina cartella..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Ricarica cartella"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Sfoglia cartella con..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Riduci albero"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Aggiorna albero"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "A_nalizzatore"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "R_iempi etichette..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Riempi etichette..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Rinomina file e cartelle..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Rinomina file e cartelle..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "Proces_sa campi..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Processa campi..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Varie"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Cerca _file..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Cerca file..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Ricerca archivio CD..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "Ricerca CDDB..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Carica nomi file da TXT..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Scrivi playlist..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Esegui il riproduttore audio"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Impostazioni"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Preferenze..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Preferenze..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Informazioni"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Termina azione corrente"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Operazioni sul file"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Ricerca file CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Azzera registro"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Soglia _sottocartelle"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Mostra cartelle nascoste"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Mostra navigatore ad albero / Visualizza per Artista ed Album"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Non riesco ad incorporare lo UI. L'errore è stato: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Pronto a partire..."
 
@@ -746,7 +758,7 @@ msgid "New default path for files selected"
 msgstr "È stato selezionato un nuovo percorso predefinito per i file"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Conferma..."
 
@@ -758,88 +770,93 @@ msgstr ""
 "Alcuni file sono stati modificati ma non salvati.\n"
 "Vuoi salvarli prima di cambiare cartella?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Tutti gli album>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 "Errore: non sono riuscito a trovare nell'albero il nodo %s mentre cercavo %s."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Albero"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Nome File"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Titolo"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artista"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Anno"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Traccia"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Genere"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Compositore"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Artista Originale"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Diritti d'autore"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Codificato da"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# File"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Vai alla cartella genitrice"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Immetti una cartella da sfogliare."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Seleziona una cartella da sfogliare!"
@@ -847,35 +864,35 @@ msgstr "Seleziona una cartella da sfogliare!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u file"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artista & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Rinomina la cartella"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Rinomina la cartella '%s' in: "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Usa maschera:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "Saranno usate delle maschere per rinominare le cartelle se questa opzione è "
 "attivata."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -884,31 +901,31 @@ msgstr ""
 "nella Finestra Analizzatore) per rinominare la cartella dai campi "
 "dell'etichetta."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "La Maschera Analizzatore non è valida"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Anteprima di rinomina cartella..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Errore..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Devi scrivere il nome di una cartella!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -943,7 +960,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -952,7 +969,7 @@ msgstr ""
 "Non posso rinominare nulla perché il nome della cartella esiste già!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -967,88 +984,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Cartella rinominata"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Programma da eseguire:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Immetti il programma da eseguire e che riceverà la cartella corrente come "
 "parametro."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Apri file con..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Immetti il programma da eseguire che riceverà il file corrente come "
 "parametro."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Devi immettere il nome di un programma!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Non ho potuto trovare il programma '%s'!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Non è possibile eseguire %s (errore %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Non posso eseguire una nuova istanza di un altro processo!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando eseguito:  '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artista / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Categoria"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Nome Traccia"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Tempo"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Ricerca Database CD"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Ricerca Automatica"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "Richiesta Database CD:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1056,16 +1073,16 @@ msgstr ""
 "Ricerca automaticamente il database CDDB usando il file selezionato "
 "(l'ordine è importante!) per generare il CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Interrompi la ricerca...  "
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Usa Cddb locale"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1077,15 +1094,15 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Ricerca Manuale"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Parole:"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 "Immetti le parole da cercare (separate da uno spazio o da un segno '+')"
@@ -1093,124 +1110,124 @@ msgstr ""
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Cerca In:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Ogni Campo"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Altro"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Ogni Categoria"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Classica"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Varie"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Colonna sonora"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclusi: funk, soul, rap, pop, industrial, metal, ecc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "film, spettacoli"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "altre che non rientrano nelle categorie precedenti"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Categorie "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Risultati:"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Cerca:"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Immetti le parole da cercare nella lista seguente"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Cerca Successivo"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Cerca Precedente"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Mostra solo linee rosse (o mostra tutte le linee) nella lista 'Artista / "
 "Album'"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Deseleziona tutte le linee"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Inverti la selezione delle linee"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Seleziona tutte le linee"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1223,36 +1240,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Imposta A:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Tutto"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Traccia #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Tracce"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Esegui l'analisi corrente per ogni file"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Corrispondi linee con l'algoritmo Levenshtein"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1267,92 +1284,96 @@ msgstr ""
 "applicare i risultati cddb, invece di usare direttamente l'ordine della "
 "posizione."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Carica le righe selezionate o tutte le righe (se non c'è selezione)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Pronto a cercare..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
-"Album: '%s', artista: '%s', lunghezza: '%s', anno: '%s', genere: '%s', ID: '%"
-"s'"
+"Album: '%s', artista: '%s', lunghezza: '%s', anno: '%s', genere: '%s', ID: "
+"'%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Inverti selezione"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Ordina per Numero Traccia"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Ordina per Nome Traccia"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Risolvo il nodo '%s'..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Non riesco a risolvere il nodo '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Non riesco a creare un nuovo socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Connessione al nodo '%s', porta '%d'..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Non riesco a connettermi al nodo '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Connesso al nodo '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Ricezione dati (%s)..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Si è verificato un errore leggendo la risposta cddb (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Non riesco a creare il file '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Non posso aprire il file '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Invio richiesta..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Non riesco ad inviare la richiesta (%s)!"
@@ -1361,62 +1382,63 @@ msgstr "Non riesco ad inviare la richiesta (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Ricezione dati..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Il server ha fornito una risposta sbagliata!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Il server ha fornito una risposta sbagliata! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Mi dispiace ma la ricerca basata sul web non è al momento disponibile!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Sono stati trovati %d album corrispondenti"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Sto ricevendo i dati della pagina %d..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Sto ricevendo i dati della pagina %d..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Altri risultati da caricare..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Non è stato selezionato alcun file!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d file selezionati!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Ricerca CD locale..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 #, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
@@ -1425,28 +1447,28 @@ msgstr ""
 "Il percorso per 'Database Locale CD' non è stato definito!\n"
 "Impostalo nella finestra delle preferenze."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Invio richiesta (CddbId: %s, #tracce: %d, Lunghezza disco: %d)..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Sono stati trovati %d album corrispondenti per DiscID '%s'"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Non posso caricare il file: '%s' (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Sto caricando l'elenco delle tracce dell'album..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1459,7 +1481,7 @@ msgstr ""
 "\n"
 "Vuoi davvero continuare?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Scrivi Etichette da CDDB..."
 
@@ -1648,8 +1670,8 @@ msgstr "Occidentale (Windows-1252)"
 #, fuzzy, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
-"Il nome del file '%s' non ha potuto essere convertito nel formato UTF-8 (%"
-"s).\n"
+"Il nome del file '%s' non ha potuto essere convertito nel formato UTF-8 "
+"(%s).\n"
 
 #: src/charset.c:545 src/charset.c:644 src/charset.c:708
 msgid "Invalid UTF-8"
@@ -1724,7 +1746,7 @@ msgstr "Parametro o percorso sconosciuto '%s'\n"
 msgid "Browser"
 msgstr "Navigatore"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "File"
 
@@ -1738,11 +1760,11 @@ msgstr "Il collegamento del file è interrotto"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Livello ?"
 
@@ -1750,7 +1772,7 @@ msgstr "?, Livello ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1758,17 +1780,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modalità:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1785,7 +1807,7 @@ msgid "Time:"
 msgstr "Tempo:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Etichetta"
 
@@ -1814,45 +1836,56 @@ msgstr "Artista:"
 msgid "Tag selected files with this artist"
 msgstr "Etichetta i file selezionati con questo artista"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artista:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Etichetta i file selezionati con questo artista"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Etichetta i file selezionati con questo nome d'album"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Etichetta i file selezionati con questo numero di disco"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Anno:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Etichetta i file selezionati con questo anno"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numera tutte le tracce in sequenza. Inizia con 01 in ogni sottocartella."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Traccia #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1860,293 +1893,302 @@ msgstr ""
 "Imposta il numero di file alle tracce selezionate, nella stessa cartella del "
 "file visualizzato."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Etichetta i file selezionati con questo numero di tracce"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Genere:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Etichetta i file selezionati con questo genere"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Commento:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Etichetta i file selezionati con questo commento"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Compositore:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Etichetta i file selezionati con questo compositore"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Artista Originale:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Etichetta i file selezionati con questo artista originale"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Diritti d'autore:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Etichetta i file selezionati con questi diritti d'autore"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Etichetta i file selezionati con questa URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Codificato da:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Etichetta i file codificati con questo nome di codificatore"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Immagini"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Immagini:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Puoi usare il trascina e rilascia per aggiungere delle immagini."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Etichetta i file selezionati con queste immagini"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 "Aggiungi le immagini all'etichetta (è disponibile anche il trascina e "
 "rilascia). "
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Rimuovi le immagini selezionate o tutte le immagini."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salva le immagini selezionate sul disco rigido."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Imposta le proprietà delle immagini selezionate."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "I file selezionati sono stati etichettati con il titolo '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Il titolo è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "I file selezionati sono stati etichettati con l'artista '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "L'artista è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "I file selezionati sono stati etichettati con l'artista '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "L'artista è stato rimosso dai file selezionati."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con con il nome d'album '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Il nome dell'album è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "I file selezionati sono stati etichettati con il numero di disco '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Il numero di disco è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "I file selezionati sono stati etichettati con l'anno '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "L'anno è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con una traccia tipo 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "I file selezionati sono stati etichettati con una traccia tipo 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Il numero di traccia è stato rimosso dai file selezionati."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Le tracce selezionate sono state numerate in sequenza."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "I file selezionati sono stati etichettati con il genere '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Il genere è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "I file selezionati sono stati etichettati con il commento '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Il commento è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "I file selezionati sono stati etichettati con il compositore '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Il compositore è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con l'artista originale '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "L'artista originale è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "I file selezionati sono stati etichettati con i diritti d'autore '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "I diritti d'autore sono stati rimossi dai file selezionati."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "I file selezionati sono stati etichettati con l'URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "L'URL è stata rimossa dai file selezionati."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con il nome del codificatore '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Il nome del codificatore è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "I file selezionati sono stati etichettati con le immagini."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Le immagini sono state rimosse dai file selezionati."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Seleziona Modalità e Maschera e ripeti la stessa azione"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Tutte le etichette sono state analizzate"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Tutte le etichette sono state rimosse"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Cerca file..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Tutti i file sono stati salvati..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "I file sono stati in parte eliminati..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Tutti i file sono stati eliminati..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2155,16 +2197,16 @@ msgstr ""
 "Vuoi scrivere l'etichetta del file\n"
 " '%s'?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Scrivi Etichetta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Rinomina File e Cartella..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2178,11 +2220,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Rinomina Cartella..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2196,11 +2238,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Rinomina File..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2213,17 +2255,17 @@ msgstr ""
 "in \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Scrittura dell'etichetta di '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Etichette scritte"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2232,21 +2274,21 @@ msgstr ""
 "Non posso scrivere l'etichetta nel file '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Non posso scrivere l'etichetta nel file '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Rinomino il file '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2259,7 +2301,7 @@ msgstr ""
 "'%s'! \n"
 "(%s) "
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2268,11 +2310,11 @@ msgstr ""
 "'%s'! \n"
 "(%s) "
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "File non rinominato/i..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2285,7 +2327,7 @@ msgstr ""
 "perché il file seguente esiste già:\n"
 " '%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2294,7 +2336,7 @@ msgstr ""
 "perché il file seguente esiste già:\n"
 " '%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2305,7 +2347,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2314,16 +2356,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Il file '%s' è stato rinominato in '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "File rinominato/i..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2334,7 +2376,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2343,17 +2385,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Ho spostato il file '%s' su '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "File spostato/i..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2366,7 +2408,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2375,11 +2417,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "File non spostato/i..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2388,16 +2430,16 @@ msgstr ""
 "Vuoi davvero eliminare definitivamente il file\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Elimina File..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Il file '%s' è stato eliminato"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2409,111 +2451,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Ricerca in corso..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "File: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr ""
 "Sono stati trovati %d file in questa cartella e nelle relative sottocartelle."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Sono stati trovati %d file in questa cartella."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u file"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "Non è stato trovato alcun file in questa cartella e nelle sue sottocartelle!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Non è stato trovato alcun file in questa cartella!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Ricerca..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  INTERROMPI la ricerca...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Seleziona una cartella da sfogliare!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Etichetta i file selezionati con questo campo"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converti '_' e '%20' in spazi"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Converti ' ' in '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Tutto maiuscolo"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Tutto minuscolo"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Prima lettera maiuscola"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Prima lettera maiuscola per ogni parola"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Rimuovi spazi"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Inserisci degli spazi prima delle lettere maiuscole"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Rimuovi spazi o trattini duplicati"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: uscita anomala! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Ricevuto segnale %s (%d) "
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2522,11 +2563,11 @@ msgstr ""
 "Probabilmente hai scoperto un baco in EasyTAG. Per favore, invia un rapporto "
 "via backtrace gdb ('gdb easytag core' poi 'bt' and 'l') a easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Segnale sconosciuto"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2560,11 +2601,11 @@ msgstr ""
 "path_to/files              Usa un percorso relativo.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: uscita normale."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2572,83 +2613,83 @@ msgstr ""
 "Alcuni file sono stati modificati ma non salvati...\n"
 "Vuoi salvarli prima di uscire dal programma?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "Vuoi veramente uscire dal programma?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "Etichetta ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Etichetta Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "Etichetta Vorbis FLAC"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "Etichetta APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etichetta MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Etichetta Wavpack"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "File MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "File MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "File Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "File successivo"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "File FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "File MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "File Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "File MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "File Wavpack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Immagini"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2656,14 +2697,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2674,11 +2715,11 @@ msgstr ""
 "nella codifica del sistema\n"
 "(Prova impostando la variabile d'ambiente G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Traduzione del nome file"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Il nome file '%s' eccede di %d caratteri e sarà quindi troncato!\n"
@@ -2702,60 +2743,60 @@ msgstr "Codificatore:"
 msgid "Channels:"
 msgstr "Canali:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "Si è verificato un errore aprendo il file '%s' (%s).\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERRORE: non è possibile scrivere i commenti sul file '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "L'etichetta di '%s' è stata scritta"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "L'etichetta di '%s' è stata rimossa"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr ""
-"Si è verificato un errore durante la rimozione dell'etichetta ID3v1 di '%"
-"s' (%s)"
+"Si è verificato un errore durante la rimozione dell'etichetta ID3v1 di "
+"'%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr ""
-"Si è verificato un errore durante la rimozione dell'etichetta ID3v2 di '%"
-"s' (%s)"
+"Si è verificato un errore durante la rimozione dell'etichetta ID3v2 di "
+"'%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr ""
-"Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v2 di '%"
-"s' (%s)"
+"Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v2 di "
+"'%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2780,79 +2821,79 @@ msgstr ""
 "\n"
 "File: %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr ""
-"Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v1 di '%"
-"s' (%s)"
+"Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v1 di "
+"'%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "L'etichetta di '%s' è stata aggiornata"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Non ci sono errori da riportare"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Non c'è più memoria disponibile"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Non ci sono dati da elaborare"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Dati formattati impropriamente"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Non c'è un buffer sul quale scrivere"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Il buffer è troppo piccolo"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "L'identificatore ID del frame non è valido"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Il campo richiesto non è stato trovato"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Il tipo di campo è sconosciuto"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "L'etichetta è già allegata al file"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "La versione dell'etichetta non è valida"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Non ci sono file da elaborare"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Si è cercato di scrivere su un file a sola lettura"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Errore nella compressione/decompressione"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Messaggio d'errore sconosciuto!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2861,7 +2902,7 @@ msgstr ""
 "Il seguente file danneggiato: '%s'\n"
 "non verrà processato dal programma perché causerebbe un errore in id3lib."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "File danneggiato..."
 
@@ -2869,74 +2910,74 @@ msgstr "File danneggiato..."
 msgid "Log"
 msgstr "Registro"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Seleziona file..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Seleziona cartella..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Attenzione..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Nessun riproduttore audio definito!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Non è possibile eseguire %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Genera una playlist"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Nome della playlist M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Usa il nome di una cartella"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Modifica Maschere"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Opzioni Playlist"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Includi solo i file selezionati"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2944,31 +2985,31 @@ msgstr ""
 "Solo il file selezionato sarà scritto sulla playlist, se questa opzione è "
 "attivata. In caso contrario vi saranno scritti tutti i file."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Usa un percorso completo per i file nella playlist"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Usa un percorso relativo per i file nella playlist"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Crea la playlist nella cartella genitrice"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Se questa opzione è attivata, la playlist sarà creata nella cartella "
 "genitrice."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Usa il separatore delle cartelle in stile DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2976,23 +3017,23 @@ msgstr ""
 "Questa opzione sostituisce il separatore di cartelle UNIX  '/' con quello "
 "DOS '\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Contenuto Playlist"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Scrivi solo la lista dei file"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Scrivi le informazioni usando il nome del file"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Scrivi le informazioni usando:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -3001,12 +3042,12 @@ msgstr ""
 "Il file della playlist '%s' esiste già!\n"
 "Sovrascrivo?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Scrivi Playlist..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -3015,24 +3056,24 @@ msgstr ""
 "Non è possibile scrivere la playlist nel file '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "È stato scritto il file della playlist '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Codificato da"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Cerca file"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3040,93 +3081,93 @@ msgstr ""
 "tutti i file."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "In:"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "è il Nome File"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "è l'Etichetta"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Maiuscolo e minuscolo"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Trovati: %d file"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Carica i nomi dei file da un file di testo"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "File:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr "Carica "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Conferma il cambio del nome dei file"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Inserisci uno spazio prima di una lettera maiuscola"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Elimina questa linea"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Elimina tutte le linee vuote"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Includi solo i file selezionati"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Includi solo i file selezionati"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Ricarica"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Scrivi solo la lista dei file"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Seleziona tutte le linee"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3135,20 +3176,20 @@ msgstr ""
 "attiva e dopo che i nomi dei file sono stati caricati (la finestra "
 "dell'analizzatore deve essere aperta)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Inserisci una linea vuota"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Elimina questa linea"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Sposta Su questa Maschera"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Sposta Giù questa Maschera"
@@ -3229,12 +3270,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERRORE: non è possibile aprire il file '%s' come vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Attenzione: il file Ogg Vorbis '%s' contiene un'etichetta ID3v2."
@@ -3843,7 +3884,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Forza l'uso della codifica di sistema ed attiva la traslitterazione"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3860,7 +3901,7 @@ msgstr ""
 "Forza l'uso della codifica di sistema e rifiuta silenziosamente alcuni "
 "caratteri"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -4021,24 +4062,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Gruppo di caratteri per le etichette ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Scrivi etichetta ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Scrivi etichetta ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -4048,12 +4100,12 @@ msgstr ""
 "MP3, se questa opzione è attivata. Sarà invece tolta in caso contrario."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "Descrizione:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4062,37 +4114,37 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Codificato da"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Gruppo di caratteri usato per scrivere i dati dell'etichetta nel file."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr " No "
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4102,26 +4154,26 @@ msgstr ""
 "Con questa opzione, un carattere che non possa essere rappresentato nella "
 "codifica scelta potrà venire approssimato ad uno o più caratteri somiglianti."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etichetta ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Scrivi etichetta ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4129,30 +4181,30 @@ msgstr ""
 "Verrà aggiunta o aggiornata un'etichetta di tipo ID3v1 in fondo ai file MP3, "
 "se questa opzione è attivata. Sarà invece tolta in caso contrario."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Gruppo di caratteri usato per scrivere i dati dell'etichetta nel file."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Gruppo di caratteri per le etichette ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4175,32 +4227,32 @@ msgstr ""
 "selezionare la codifica 'Windows-1251' per caricare etichette scritte sotto "
 "Windows e 'KOI8-R' per caricare etichette scritte sotto sistemi Unix."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Gruppo di caratteri usato per leggere i dati dell'etichetta nel file."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Analizzatore"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Analizzatore Riempi etichetta - Conversione Caratteri"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 "Converti il carattere trattino-basso '_' e la stringa '%20' nello spazio ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converti lo spazio ' ' nel trattino-basso '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4209,11 +4261,11 @@ msgstr ""
 "dall'analizzatore per etichette, se questa opzione è attivata."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Analizzatore Rinomina File - Conversione Caratteri"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4222,18 +4274,18 @@ msgstr ""
 "dall'analizzatore per nomi di file, se questa opzione è attivata."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Analizzatore Processa Campi - Conversione Caratteri"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Non scrivere maiuscola la prima lettera per alcune preposizioni ed articoli."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4246,15 +4298,15 @@ msgstr ""
 "Voce'invece di 'Testo In Una Voce')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Finestra Analizzatore"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Apri la Finestra Analizzatore all'avvio"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4262,11 +4314,11 @@ msgstr ""
 "Attiva questa opzione per aprire automaticamente la finestra "
 "dell'analizzatore all'avvio di EasyTAG."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Finestra dell'analizzatore sempre in primo piano"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4275,16 +4327,16 @@ msgstr ""
 "se questa opzione è attivata."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Campi"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Sovrascrivi i campi durante la scansione dell'etichetta"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4293,11 +4345,11 @@ msgstr ""
 "Verranno riempiti solo i campi vuoti se disattivata, se questa opzione è "
 "attivata."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Imposta questo testo come commento predefinito:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4306,12 +4358,12 @@ msgstr ""
 "commento quando usi l'analizzatore 'Riempi Etichetta'."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Usa CRC32 come commento predefinito (solo per file con le etichette ID3)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4322,42 +4374,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "Database CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Impostazioni Server per Ricerca Automatica"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Nome:"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "Percorso CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Impostazioni Server per Ricerca Manuale"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Database Locale CD"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Percorso:"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4370,52 +4422,52 @@ msgstr ""
 "'soundtrack' e 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Impostazioni Proxy"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Utilizza un proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Imposta come attive le impostazioni del server proxy."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Nome Nodo:"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Nome del server proxy."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Porta del server proxy."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Nome Utente:"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Nome dell'utente per il server proxy."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Password Ptente:"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Password dell'utente per il proxy server."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Elenco Nomi Traccia"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4423,7 +4475,7 @@ msgstr ""
 "Seleziona il file audio corrispondente (concordemente alla posizione o al "
 "DLM se attivato più sotto)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4433,7 +4485,7 @@ msgstr ""
 "attivata."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4444,15 +4496,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Conferma l'uscita dal programma"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4460,57 +4512,61 @@ msgstr ""
 "Apre una finestra di dialogo per chiedere conferma prima di uscire dal "
 "programma, se questa opzione è attivata."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Conferma la scrittura delle etichette"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Conferma il cambio del nome dei file"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Conferma l'eliminazione dei file"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Conferma la scrittura della playlist"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Applica le modifiche (senza salvare) e chiudi questa finestra"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Chiudi questa finestra senza salvare"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Salva le modifiche e chiudi questa finestra"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Esempio: %.*d_-_Nome_traccia_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Le modifiche sono state applicate"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "La configurazione è stata salvata"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "La configurazione è rimasta invariata"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4521,37 +4577,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Non una cartella"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Il riproduttore audio '%s' non può essere trovato!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Riempi Etichetta"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Rinomina File e Cartella"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Processa Campi"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "L'etichetta è stata analizzata con successo..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "L'etichetta è stata analizzata con successo... (%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4559,23 +4615,23 @@ msgstr ""
 "Analizzatore Etichetta: strano.... l'estensione '%s' non è stata trovata nel "
 "nome file '%s'!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
 "Errore Scansione: non è possibile trovare il separatore '%s' all'interno di "
 "'%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Non posso convertire il nome del file '%s' nella codifica di sistema."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Il nuovo nome del file è stato processato con successo..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Il nuovo nome del file è stato processato con successo... (%s)"
@@ -4583,41 +4639,41 @@ msgstr "Il nuovo nome del file è stato processato con successo... (%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Scansione Etichetta e Nome File"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Analizzatore: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Seleziona il tipo di analizzatore da usare"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Apri la finestra dell'analizzatore / Scansiona i file selezionati"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Opzioni Analizzatore"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Mostra/Nascondi Modificatore Maschere"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Mostra/Nascondi Legenda"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4627,15 +4683,15 @@ msgstr ""
 "etichette."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Anteprima riempimento etichette..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Anticipa la maschera con il percorso corrente"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4648,15 +4704,15 @@ msgstr ""
 "carattere è /, altrimenti è relativo al vecchio percorso."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Anteprima rinomina file..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Seleziona i campi:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4665,126 +4721,136 @@ msgstr ""
 "Scegli quelli di tuo proprio interesse."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Processa il campo nome"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Processa il campo titolo"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Processa il campo artista"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Processa il campo artista"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Processa il campo album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Processa il campo genere"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Processa il campo commento"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Processa il campo compositore"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Processa il campo artista originale"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Processa il campo diritti d'autore"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Processa il campo URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Processa il campo nome del codificatore"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Inverti Selezione"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Seleziona/Deseleziona Tutto."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Converti '_' e '%20' in ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Converti:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "a:"
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4792,7 +4858,7 @@ msgstr ""
 "Il carattere di trattino-basso o la stringa  '%20'  sono sostituiti con uno "
 "spazio. Esempio, prima: 'Testo%20In%20Una_Voce', dopo: 'Testo In Una Voce'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4800,16 +4866,16 @@ msgstr ""
 "Il carattere spazio è sostituito con un trattino-basso. Esempio, prima: "
 "'Testo in una voce', dopo: 'Testo_in_una_voce'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4817,7 +4883,7 @@ msgstr ""
 "Converti tutte le parole di tutti i campi in maiuscolo. Esempio, prima: "
 "'Testo IN UNA voce', dopo: 'TESTO IN UNA VOCÈ."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4825,7 +4891,7 @@ msgstr ""
 "Converti tutte le parole di tutti i campi in minuscolo. Esempio, prima: "
 "'TESTO IN una voce', dopo: 'testo in una voce'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4833,7 +4899,7 @@ msgstr ""
 "Converti la lettera iniziale della prima parola di tutti i campi in "
 "maiuscolo. Esempio, prima: 'testo IN una VOCE', dopo: 'Testo in una voce'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4841,7 +4907,7 @@ msgstr ""
 "Converti la lettera iniziale di ogni parola di tutti i campi in maiuscolo. "
 "Esempio, prima: 'Testo in una VOCE', dopo: 'Testo In Una Voce'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4850,15 +4916,15 @@ msgstr ""
 "Viene inserito uno spazio prima di ogni lettera maiuscola. Esempio, prima:  "
 "'TestoInUnaVoce', dopo:  'Testo In Una Voce'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Inserisci uno spazio prima di una lettera maiuscola"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Rimuovi i duplicati di spazi ed i trattini-bassi"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4866,7 +4932,7 @@ msgstr ""
 "Rimuovi tutti gli spazi fra le parole. Esempio, prima: 'Testo In Una Voce', "
 "dopo:  'TestoInUnaVoce'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4874,7 +4940,7 @@ msgstr ""
 "Viene inserito uno spazio prima di ogni lettera maiuscola. Esempio, prima:  "
 "'TestoInUnaVoce', dopo:  'Testo In Una Voce'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4885,183 +4951,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artista"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : artista"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commento"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositore"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : diritti d'autore"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: numero disco"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : codificato da"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genere"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorato"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : numero di tracce"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artista originale"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : traccia"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : titolo"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : anno"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Modificatore Maschera"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Crea Nuova Maschera"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Sposta Su questa Maschera"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Sposta Giù questa Maschera"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Duplica Maschera"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Aggiungi Maschere Predefinite"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Rimuovi Maschera"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Salva Maschere"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nuova_maschera"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Copia: nessuna riga selezionata!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Rimuovi: nessuna riga selezionata!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Sposta su: nessuna riga selezionata!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Sposta giù: nessuna riga selezionata!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ERRORE: non riesco a scrivere il file di configurazione %s (%s)\a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Non riesco ad aprire il file di configurazione '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Carico la configurazione predefinita..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Non riesco a creare o ad aprire il file '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ERRORE: non riesco a scrivere la lista nel file %s (%s)\a"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Carico le maschere preimpostate di 'Riempi Etichetta'..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Carico le maschere preimpostate di 'Rinomina File'..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Carico le maschere preimpostate di 'Rinomina Cartella'..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERRORE: la variabile d'ambiente HOME non è definita!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERRORE: non riesco a creare la cartella '%s' (%s)!"
@@ -5317,8 +5388,8 @@ msgstr "Riproduttore Audio: '%s'"
 #~ "for writing ID3 tags', it will be used instead of ISO-8859-1."
 #~ msgstr ""
 #~ "Usa la codifica UNICODE per le etichette. Le etichette ID3v2 sono sempre "
-#~ "salvate in una codifica di caratteri a singolo byte (di default ISO-8859-"
-#~ "1).\n"
+#~ "salvate in una codifica di caratteri a singolo byte (di default "
+#~ "ISO-8859-1).\n"
 #~ "\n"
 #~ "Verrà usata una codifica diversa da ISO-8850-1 se selezionata con il "
 #~ "comando  'Usa codifica non standard per scrivere le etichette ID3'."
diff --git a/po/ja.gmo b/po/ja.gmo
index 3bfa36b..ec3d1f8 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index c7bbd07..e612da6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag 2.1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2008-02-23 16:03+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana at gmail.com>\n"
 "Language-Team: Japanese <gnome-translation at gnome.gr.jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr ""
 "ができます。"
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(ドイツ語)"
 
@@ -106,137 +108,137 @@ msgstr "(ヘブライ語)"
 msgid "(Serbian translation)"
 msgstr "(セルビア語)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "拡張子"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "状態"
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "コメント"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "情報..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "情報"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(ビルドした日付: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(使用: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "作者: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-メール: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "ウェブ・ページ: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "紹介:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "æ‹¡å¼µ"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "MP3 ファイルのサポート"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "有効"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "無効"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "ID3v2.3 タグ書き込みサポート"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "利用可能"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Ogg Vorbis ファイルのサポート"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Speex ファイルのサポート"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "FLAC ファイルのサポート"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "MP4/AAC ファイルのサポート"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "WavPack ファイルのサポート"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "貢献者"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "翻訳:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "全般:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "変更点"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "ファイル '%s' (%s) が開けません\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ファイルのオープン中にエラー: '%s' (%s)"
@@ -244,484 +246,494 @@ msgstr "ファイルのオープン中にエラー: '%s' (%s)"
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "タグ順で並び替え"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "プロパティ順で並び替え"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "ファイル名で昇順"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "ファイル名で降順"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "作成日で昇順"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "作成日で降順"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "トラック番号で昇順"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "トラック番号で降順"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "タイトルで昇順"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "タイトルで降順"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "演奏者で昇順"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "演奏者で降順"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "演奏者で昇順"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "演奏者で降順"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "アルバム名で昇順"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "アルバム名で降順"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "制作年で昇順"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "制作年で降順"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "ジャンルで昇順"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "ジャンルで降順"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "コメントで昇順"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "コメントで降順"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "コンポーザで昇順"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "コンポーザで降順"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "オリジナルの演奏者で昇順"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "オリジナルの演奏者で降順"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "ライセンスで昇順"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "ライセンスで降順"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "URLで昇順"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "URLで降順"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "エンコーディングで昇順"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "エンコーディングで降順"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "ファイルの種類で昇順"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "ファイルの種類で降順"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "サイズで昇順"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "サイズで降順"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "演奏時間で昇順"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "演奏時間で降順"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "ビットレートで昇順"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "ビットレートで降順"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "サンプリングレートで昇順"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "サンプリングレートで降順"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "他のプログラムで開く..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "全ファイルの選択"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "全ファイルの未選択"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "ファイル選択の反転"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "ファイルの削除..."
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "先頭のファイル(_F)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "先頭のファイルへジャンプします"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "前のファイル(_P)"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "前のファイルへジャンプします"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "次のファイル(_N)"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "次のファイルへジャンプします"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "最後のファイル(_L)"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "最後のファイルへジャンプします"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "ファイルのスキャン(_C)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "ファイルをスキャンします"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "タグの削除(_R)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "タグを削除します"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "最後の変更に戻す(_U)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "最後のファイル変更に戻します"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "最後の変更を取り消す(_E)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "最後のファイル変更を取り消します"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "ファイルの保存(_S)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "ファイルを保存します"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "ファイルの強制保存(_F)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "ファイルを強制的に保存します"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "最後の変更に戻す"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "最後の変更を取り消す"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "終了します"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "参照(_B)"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "ホームへ(_H)"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "ホーム・フォルダへ移動します"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "デフォルトのフォルダへ移動します"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "ホーム・フォルダへ移動します"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "ホーム・フォルダへ移動します"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "ホーム・フォルダへ移動します"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "デフォルトへ(_D)"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "デフォルトのフォルダへ移動します"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "このフォルダをデフォルトに(_C)"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "このパスをデフォルト・フォルダにセットします"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "ツリー表示 | 演奏者・アルバム表示"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "フォルダ名の変更..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "フォルダの再読み込み"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "他のプログラムで参照 ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "ツリーを折り畳む(_C)"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "ツリーの更新(_R)"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "スキャナ(_C)"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "タグの付与(_F)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "タグを付与します..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "ファイル名とフォルダ名の変更(_R)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "ファイル名とフォルダ名を変更します..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "フィールドの編集(_P)..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "フィールドを編集します..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "その他(_M)"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "ファイルの検索(_F)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "ファイルを検索します..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "CDデータベースの検索(_B)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB から検索します..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "TXT からファイル名の読み込み..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "演奏一覧の書き込み..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "オーディオ・プレイヤーの起動"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "設定(_S)"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "設定(_P)..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "設定..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "情報(_A)"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "現在の処理を中止します"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "ファイル操作(_F)"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "CDDB 検索..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "ログの消去"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "サブフォルダを参照する(_S)"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "隠しフォルダを表示する"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "ツリー表示または演奏者とアルバム名表示を切り替えます"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "UI をマージできませんでした (エラー: %s)\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "起動完了..."
 
@@ -730,7 +742,7 @@ msgid "New default path for files selected"
 msgstr "新しいデフォルトパスが指定されました"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "確認..."
 
@@ -742,119 +754,124 @@ msgstr ""
 "いくつかのファイルを変更しましたが、保存していません...\n"
 "フォルダを移動する前に保存しますか?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<全てのアルバム>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "エラー: %s の検索中に、ツリーのノード %s が見つかりませんでした。"
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "ツリー"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "ファイル名"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "タイトル"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "演奏者"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "演奏者"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "アルバム名"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "制作年"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "トラック"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "ジャンル"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "コンポーザ"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "演奏者:"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "ライセンス"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 msgid "Encoded By"
 msgstr "エンコーダ"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# アルバム"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# ファイル"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "上のフォルダへ移動します"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "参照するフォルダを入力して下さい。"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 msgid "Select a directory to browse."
 msgstr "参照するフォルダを選択して下さい"
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u 個のファイル"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "演奏者 / アルバム"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "フォルダ名の変更"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "変更後のフォルダ '%s' の名前 : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "使用するマスク :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "これを有効にすると、フォルダ名を変更する時のマスクとして使用します"
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -862,31 +879,31 @@ msgstr ""
 "タグフィールドからフォルダ名を変更するために使用するマスクのコード(凡例を参照"
 "のこと)を選択または入力して下さい"
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "スキャナマスクが正しくありません"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "フォルダ名変更のプレビュー..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "エラー..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "フォルダ名を入力して下さい!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -921,7 +938,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -930,7 +947,7 @@ msgstr ""
 "このフォルダ名が既に存在しているので、名前を変更できません!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -945,86 +962,86 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "フォルダ名を変更しました"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "実行するプログラム :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "実行するプログラム名を入力して下さい。引数は現在のフォルダ名になります。"
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "他のプログラムで開く..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "実行するプログラム名を入力して下さい。引数は現在のファイル名になります。"
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "プログラム名を入力して下さい!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "プログラム '%s' が見つかりません!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "%sを実行できません! (エラー %d)\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "子プロセスを作成すできません!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "コマンドと引数 : '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "演奏者 / アルバム"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "カテゴリ"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "トラック名"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "演奏時間"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "CD データベースの検索"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "自動検索"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "CD データベースへの要求 :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1032,16 +1049,16 @@ msgstr ""
 "指定したファイルを使って CddbID を生成するようCDDBへ自動的に要求します (順番"
 "も関係します!)"
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "検索の停止..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "ローカルの CDDB を使用する"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1052,137 +1069,137 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "手動検索"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "単語 :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "検索する単語を入力して下さい (区切り記号: スペース ' ' または '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "検索対象 :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "全てのフィールド"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "その他"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "全てのカテゴリ"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "ブルース"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "クラッシック"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "カントリー"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "フォーク"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "ジャズ"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "その他"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "ニューエイジ"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "レゲ"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "ロック"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "サウンドトラック"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "ファンク、ソウル、ラップ、ポップ、インダストリアル、メタルなどを含む"
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "映画、ショー"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "上記のカテゴリに一致しないその他のもの"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " カテゴリ "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "結果 :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "検索 :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "次の一覧の中に検索する単語を入力して下さい"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "次を検索します"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "前を検索します"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "'アーティスト/アルバム' のリストに赤線のみ、または全ての線を表示します"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "全ての行を未選択にする"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "選択した行を未選択に反転します"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "全ての行を選択します"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1195,36 +1212,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "セット先 :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "全て"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "トラック #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# トラック"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "各ファイルに現在のスキャナを実行する"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Levenshtein アルゴリズムで行を比較する"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1237,15 +1254,15 @@ msgstr ""
 "Levenshtein Metric) を適用します (これは楽曲ファイルに相当するものを選択した"
 "り、CDDB の結果を適用する時に使用します)"
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "指定した行または (もし行が指定されなければ) 全ての行を読み込みます"
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "検索の準備完了..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1253,76 +1270,80 @@ msgstr ""
 "アルバム: '%s', 演奏者: '%s', 時間: '%s', 制作年: '%s', ジャンル: '%s', ID: "
 "'%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "選択範囲を反転する"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "トラック番号で並び替え"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "トラック名で並べ替え"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "ホスト '%s' の検索中 ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "ホスト '%s' (%s) の名前解決ができません!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "新しいソケット (%s) を生成できません!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "ホスト '%s' (ポート '%d') に接続中 ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "ホスト '%s' (%s) に接続できません!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "ホスト '%s' に接続しました"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "データ (%s) の受信中 ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "cddb からの応答 (%s) の読み込み中にエラー!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "ファイル '%s' (%s) を生成できません"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "ファイル '%s' (%s) が開けません"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "リクエストの送信中 ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "リクエスト (%s) を送信できません!"
@@ -1331,63 +1352,64 @@ msgstr "リクエスト (%s) を送信できません!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "データの受信中 ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "サーバがおかしなデータを返してきました!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "サーバがおかしなデータを返してきました! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "すみません、現在ウエブ検索はダウンしています!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "一致するアルバムが %d 個見つかりました"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "%d ページのデータの受信中 (アルバム %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "%d ページのデータの受信中..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "さらに読み込んだ結果..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "ファイルが選択されていません!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 #, fuzzy
 msgid "More than 99 files selected! Can't send request!"
 msgstr "ファイル選択が99個を越えています。リクエストを送信できません!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d 個のファイルを選択しました"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "ローカル CD の検索..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
@@ -1395,28 +1417,28 @@ msgstr ""
 "ローカル CD データベースのパスが未設定です!\n"
 "この検索の前に設定ウィンドウで設定してください。"
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "リクエストの要求中 (CddbId: %s, トラック番号: %d, サイズ: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "DiscID '%s' に一致するアルバムが %d 個見つかりました"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "ファイル '%s' (%s) が読み込めません!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "アルバムのトラック一覧の読み込み中 ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1429,7 +1451,7 @@ msgstr ""
 "\n"
 "続行してもよろしいですか?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "CDDB からタグの書き込み中..."
 
@@ -1690,7 +1712,7 @@ msgstr "未知のパラメータまたはパス '%s'\n"
 msgid "Browser"
 msgstr "参照"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "ファイル"
 
@@ -1704,11 +1726,11 @@ msgstr "ファイルのリンクがありません"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, レイヤー ?"
 
@@ -1716,7 +1738,7 @@ msgstr "?, レイヤー ?"
 msgid "Bitrate:"
 msgstr "ビットレート:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? KB/秒"
 
@@ -1724,17 +1746,17 @@ msgstr "? KB/秒"
 msgid "Freq:"
 msgstr "周波数:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "モード:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1751,7 +1773,7 @@ msgid "Time:"
 msgstr "演奏時間:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "ã‚¿ã‚°"
 
@@ -1780,45 +1802,56 @@ msgstr "演奏者:"
 msgid "Tag selected files with this artist"
 msgstr "この演奏者を選択したファイルにタグ付けします"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "演奏者:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "この演奏者を選択したファイルにタグ付けします"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "アルバム:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "このアルバム名を選択したファイルにタグ付けします"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "このディスク番号を選択したファイルにタグ付けします"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "制作年:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "この制作年を選択したファイルにタグ付けします"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "選択したトラック番号を順番に付与します (各サブフォルダは 01 から開始します)"
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "トラック #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1826,287 +1859,296 @@ msgstr ""
 "表示されているファイルと同じフォルダで、選択したトラック数に対するファイル数"
 "をセットします"
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "このトラック番号を選択したファイルにタグ付けします"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "ジャンル:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "このジャンルを選択したファイルにタグ付けします"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "コメント:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "このコメントを選択したファイルにタグ付けします"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "コンポーザ:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "このコンポーザを選択したファイルにタグ付けします"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "演奏者:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "この演奏者を選択したファイルにタグ付けします"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "ライセンス:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "このライセンスを選択したファイルにタグ付けします"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "このURLを選択したファイルにタグ付けします"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "エンコーダ:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "このエンコーダを選択したファイルにタグ付けします"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "画像"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "画像:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "画像をドラッグ&ドロップして追加できます"
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "これらの画像を選択したファイルにタグ付けします"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "画像をタグに追加します (ドラッグ&ドロップも可能)"
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "選択した画像または全ての画像を削除します"
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "選択した画像を保存します"
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "選択した画像のプロパティを設定します"
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "選択したファイルにタイトル '%s' をタグ付けしました"
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "選択したファイルからタイトルを削除しました"
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "選択したファイルに演奏者 '%s' をタグ付けしました"
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "選択したファイルから演奏者を削除しました"
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "選択したファイルに演奏者 '%s' をタグ付けしました"
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "選択したファイルから演奏者を削除しました"
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "選択したファイルにアルバム名 '%s' をタグ付けしました"
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "選択したファイルからアルバム名を削除しました"
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "選択したファイルにディスク番号 '%s' をタグ付けしました"
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "選択したファイルからディスク番号を削除しました"
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "選択したファイルに制作年 '%s' をタグ付けしました"
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "選択したファイルから制作年を削除しました"
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "選択したファイルにトラック番号 'xx/%s' をタグ付けしました"
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "選択したファイルにトラック番号 'xx' をタグ付けしました"
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "選択したファイルからトラック番号を削除しました"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "選択したトラック番号を順番に付与しました"
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "選択したファイルにジャンル '%s' をタグ付けしました"
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "選択したファイルからジャンルを削除しました"
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "選択したファイルにコメント '%s' をタグ付けしました"
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "選択したファイルからコメントを削除しました"
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "選択したファイルにコンポーザ '%s' をタグ付けしました"
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "選択したファイルからコンポーザを削除しました"
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "選択したファイルにオリジナルの演奏者 '%s' をタグ付けしました"
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "選択したファイルからオリジナル演奏者を削除しました"
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "選択したファイルにライセンス '%s' をタグ付けしました"
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "選択したファイルからライセンスを削除しました"
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "選択したファイルに URL '%s' をタグ付けしました"
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "選択したファイルから URL を削除しました"
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "選択したファイルにエンコーディング '%s' をタグ付けしました"
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "選択したファイルからエンコーディングを削除しました"
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "選択したファイルに画像 '%s' をタグ付けしました"
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "選択したファイルから画像を削除しました"
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "モードとマスクを指定して、同様の操作を繰り返して下さい"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "全てのタグはスキャン済みです"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "全てのタグが削除されています"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "ファイルを検索します..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "全てのファイルが保存されました..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "ファイルの一部が削除されました..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "全てのファイルが削除されました..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2115,16 +2157,16 @@ msgstr ""
 "次のファイル にタグを書き込みますか?\n"
 "%s"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "タグの書き込み中..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "ファイル名とフォルダ名の変更..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2138,11 +2180,11 @@ msgstr ""
 "'%s'"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "フォルダ名の変更..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2156,11 +2198,11 @@ msgstr ""
 "'%s'"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "ファイル名の変更中..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2173,17 +2215,17 @@ msgstr ""
 "=>\n"
 "'%s'"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "'%s' のタグが書き込まれました"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "タグが書き込まれました"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2192,21 +2234,21 @@ msgstr ""
 "ファイル '%s' にタグを書き込めません!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "ファイル '%s' にタグを書き込めません!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "ファイル名の変更中 (%s)"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2219,7 +2261,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2228,11 +2270,11 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "ファイル名は変更されませんでした..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2245,7 +2287,7 @@ msgstr ""
 "次のファイルは既に存在していますからです:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2254,7 +2296,7 @@ msgstr ""
 "次のファイルは既に存在していますからです:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2265,7 +2307,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2274,16 +2316,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "ファイル名 '%s' => '%s' へ変更されました"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "ファイル名が変更されました..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2294,7 +2336,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2303,17 +2345,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "ファイル '%s' => '%s' へ移動しました"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "ファイルを移動しました..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2326,7 +2368,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2335,11 +2377,11 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "ファイルは移動しませんでした..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2348,16 +2390,16 @@ msgstr ""
 "次のファイルを完全に削除しても宜しいですか?\n"
 "'%s'"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "ファイルの削除..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "ファイル '%s' が削除されました"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2369,109 +2411,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "検索中..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "ファイル: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "このフォルダ配下に %d 個のファイルが見つかりました"
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "このフォルダの中に %d 個のファイルが見つかりました"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u 個のファイル"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "このフォルダ配下にはファイルがありませんでした!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "このフォルダの中にはファイルがありませんでした!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "検索中..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  検索の停止...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "参照するフォルダを選択して下さい!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "選択したファイルにこのフィールドをタグ付けします"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "'_' と '%20' をスペースに変換する"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "' ' を '_' に変換する"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "全て大文字にする"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "全て小文字にする"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "最初の文字だけ大文字にする"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "単語の最初の文字だけ大文字にする"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "スペースを削除する"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "大文字の前にスペースを挿入する"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "重複したスペースまたはアンダースコアを削除する"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: 異常終了しました! (PID: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "シグナル %s (%d) を受け取りました\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2481,11 +2522,11 @@ msgstr ""
 "(`gdb easytag core` して 'bt' と 'l' コマンドの結果) を easytag at gmail.com ま"
 "でメールして下さい。"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "不明なシグナル"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2518,11 +2559,11 @@ msgstr ""
 "path_to/files     現在のフォルダからファイルを読み込む\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: 正常に終了しました。"
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2530,82 +2571,82 @@ msgstr ""
 "いくつかのファイルを変更しましたが、保存していません...\n"
 "プログラムを終了する前に保存しますか?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " 本当にプログラムを終了しますか?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 ã‚¿ã‚°"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis ã‚¿ã‚°"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis ã‚¿ã‚°"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE ã‚¿ã‚°"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC ã‚¿ã‚°"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack ã‚¿ã‚°"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 ファイル"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 ファイル"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis ファイル"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex ファイル"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC ファイル"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack ファイル"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's オーディオ・ファイル"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC ファイル"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack ファイル"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "画像 (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2613,14 +2654,14 @@ msgid "%d kb/s"
 msgstr "%d KB/秒"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2631,11 +2672,11 @@ msgstr ""
 "変換できませんでした : '%s'\n"
 "(環境変数 G_FILENAME_ENCODING を設定してみて下さい)"
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "ファイル名の翻訳"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "ファイル名 '%s' が %d 文字だけ多すぎるので切りつめます!\n"
@@ -2659,54 +2700,54 @@ msgstr "エンコーダ:"
 msgid "Channels:"
 msgstr "チャンネル数:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "FLACファイルのオープン中にエラー: '%s' (%s)"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr "画像ブロックが不正です: '%s'"
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERROR: ファイル '%s' (%s) にコメントを書き込むのに失敗しました。"
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "'%s' のタグが書き込まれました"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "'%s' のタグを削除しました"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v1 タグの削除中にエラー"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v2 タグの削除中にエラー"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v2 タグの更新中にエラー"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2731,77 +2772,77 @@ msgstr ""
 "\n"
 "ファイル : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v1 タグの更新中にエラー"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "'%s' のタグを更新しました"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "エラーはありません"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "有効なメモリがありません"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "解析するデータがありません"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "データのフォーマットが不適切です"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "書き込むバッファがありません"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "バッファが小さすぎます"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "フレーム ID が正しくありません。"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "指定したフィールドが見つかりません"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "フィールドの種類が不明です"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "既にタグがファイルについています"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "タグのバージョンが正しくありません"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "解析するファイルがありません"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "読み込み専用のファイルに書き込もうとしています"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "圧縮/非圧縮エラーです"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "不明なエラーです!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2810,7 +2851,7 @@ msgstr ""
 "次に示すような壊れたファイル '%s' は\n"
 "id3lib の中でエラーを引き起こすためプログラムが正常に処理しません。"
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "壊れたファイル..."
 
@@ -2818,74 +2859,74 @@ msgstr "壊れたファイル..."
 msgid "Log"
 msgstr "ログ"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "ファイルの選択..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "フォルダの選択..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "警告..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "オーディオプレーヤが未設定です!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "'%s' (%s) を実行できません!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "演奏一覧の生成"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3U 演奏一覧の名前"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "フォルダ名を使用する"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "マスクの編集"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "演奏一覧のオプション"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "指定したファイルのみ含める"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2893,29 +2934,29 @@ msgstr ""
 "これを有効にすると、選択したファイルのみ演奏一覧へ書き込まれます (無効にする"
 "と、全てのファイルが書き込まれます)"
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "演奏一覧の中でファイルのフルパス名を使用する"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "演奏一覧の中でファイルに関連するパス名を使用する"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "演奏一覧を親フォルダに生成する"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "これを有効にすると、演奏一覧を親フォルダに生成します"
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "DOS フォルダの区切りを使用する"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2923,23 +2964,23 @@ msgstr ""
 "これは UNIX フォルダの区切り '/' を DOS の区切り '\\' へ置き換えるオプション"
 "です"
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "演奏一覧の内容"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "演奏一覧ファイルの保存のみ"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "ファイル名で使用する情報の保存のみ"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "書き込む情報 :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2948,12 +2989,12 @@ msgstr ""
 "演奏一覧ファイル '%s' は既に存在します!\n"
 "上書きしますか?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "演奏一覧の書き込み中..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2962,24 +3003,24 @@ msgstr ""
 "演奏一覧ファイル '%s' を書き込めません!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "演奏一覧ファイル '%s' が書き込まれました"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "エンコーダ"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "ファイルの検索"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2987,104 +3028,104 @@ msgstr ""
 "示します)"
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "対象 :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "ファイル名"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "ã‚¿ã‚°"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "大小文字を無視する"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "一致するファイル: %d 個"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "TEXT ファイルからファイル名を読み込む"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "TEXT ファイル :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " 読み込む "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "テキストファイルの内容"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "選択した行の前にスペースを挿入する"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "選択した行を削除する"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "空行を全て削除する"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "選択した行を上に移動"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "選択した行を下へ移動"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "再読込"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "ファイルの一覧"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "選択した行:"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
 msgstr "このオプションを有効にすると"
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "空行を挿入する"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "この行を削除する"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "この行を上に移動します"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "この行を下に移動します"
 
@@ -3169,12 +3210,12 @@ msgstr ""
 "Ogg Vorbis: 内部ロジックの誤り――ヒープやスタックが破壊されるバグです (ファイ"
 "ル: '%s')"
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERROR: ファイル '%s' を vorbis (%s) として開くのに失敗しました。"
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "警告: Ogg Vorbis ファイル '%s' には ID3v2 タグがあります。"
@@ -3768,7 +3809,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "システムのエンコーディングに強制的に変換して音訳してみる"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3783,7 +3824,7 @@ msgid ""
 "characters"
 msgstr "システムのエンコーディングに強制的に変換して変換できない文字は無視する"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3936,22 +3977,33 @@ msgstr "圧縮する"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "ID3v2 タグを圧縮します"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "ID3 タグ書き込み時の文字セット"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2 ã‚¿ã‚°"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "ID3v2 でタグを書き込む"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3960,11 +4012,11 @@ msgstr ""
 "れ以外は削除します)"
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "バージョン:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3976,34 +4028,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "文字セット:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "使用する Unicode の種類"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "ファイルのタグ情報を書き込む際に使用する文字セットです"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "iconv() の追加設定:"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "なし"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
@@ -4012,25 +4064,25 @@ msgstr ""
 "このオプションを指定すると、文字が対象となる文字セットで表現できない時は、そ"
 "れを変更せずエラーメッセージを表示します"
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1 ã‚¿ã‚°"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "ID3v1.x でタグを書き込む"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4038,28 +4090,28 @@ msgstr ""
 "これを有効にすると、MP3 ファイルの最後に ID3v1 タグが追加/更新されます (それ"
 "以外は削除します)"
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "ファイルへ ID3v1 タグを書き込む際に使用する文字セットです"
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "ID3 タグ読み込み時の文字セット"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "規格外:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4080,31 +4132,31 @@ msgstr ""
 "込まれたタグを読み込むために 'Windows-1251' を選択して下さい (Unix の場合は "
 "'KOI8-R')"
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "ファイルのタグ情報を読み込む際に使用する文字セットです"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "スキャナ"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "タグ付与スキャナ - 文字セットの変換"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "アンダースコア '_' と文字列 '%20' をスペース ' ' に変換する"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "スペース ' ' をアンダースコア '_' に変換する"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4112,11 +4164,11 @@ msgstr ""
 "これを有効にすると、タグのスキャナでマスクを適用した際にこの変換を使用します"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "ファイル名変更のスキャナ - 文字セットの変換"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4125,17 +4177,17 @@ msgstr ""
 "します"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "PFS - 文字セットの変換"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "前置詞や箇条書きの場合は先頭にある文字を大文字にしない"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4147,15 +4199,15 @@ msgstr ""
 "Entry' ではなく 'Text in an Entry')"
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "スキャナ・ウィンドウ"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "起動時にスキャナ・ウィンドウを開く"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4163,11 +4215,11 @@ msgstr ""
 "これを有効にすると、EasyTAG が起動されたら自動的にスキャナ・ウィンドウが開き"
 "ます"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "スキャナ・ウィンドウを常に上に配置する"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4176,16 +4228,16 @@ msgstr ""
 "れます"
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "フィールド"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "タグのスキャン時にフィールドを上書きする"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4193,11 +4245,11 @@ msgstr ""
 "これを有効にすると、スキャナはフィールドの中のテキストを新しいテキストに置き"
 "換えます (無効にすると、空のフィールドのみ埋められます)"
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "このテキストをデフォルトのコメントにする :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4206,12 +4258,12 @@ msgstr ""
 "合にこのオプションを有効にして下さい"
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 #, fuzzy
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "デフォルトのコメントに CRC32 を使用する (ID3 タグが付いたファイルのみ)"
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4222,42 +4274,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD データベース"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "自動検索のサーバ側の設定"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "名前 :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "ポート番号 :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI パス名 :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "手動検索のサーバ側の設定"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "ローカル CD データベース"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "パス :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4269,58 +4321,58 @@ msgstr ""
 "'reggae', 'rock', 'soundtrack', 'misc'"
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "プロキシの設定"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "プロキシを使う"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "利用するプロキシ・サーバを入力して下さい"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "ホスト名 :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "プロキシ・サーバの名前"
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "プロキシ・サーバのポート番号"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "ユーザ名 :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "プロキシ・サーバに対するユーザ名です"
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "ユーザ・パスワード :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "プロキシ・サーバに対するユーザのパスワードです"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "トラック名の一覧"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "関連する楽曲ファイルを選択する (位置または DLM に相当するもの)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4329,7 +4381,7 @@ msgstr ""
 "ファイルも自動的に選択します"
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4338,71 +4390,75 @@ msgstr "楽曲ファイルの名前に一致するタイトルに DLM を適用
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "確認メッセージ"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "プログラムの終了を確認する"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "これを有効にすると、プログラム終了時に確認ダイアログが表示されます"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "タグの書き込みを確認する"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "ファイル名の変更を確認する"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "ファイルの削除を確認する"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "演奏一覧の書き込みを確認する"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "設定を適用して(保存はしません)、このダイアログを閉じます"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "設定を保存せずに、このダイアログを閉じます"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "設定を保存して、このダイアログを閉じます"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(例 : %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "設定が適用されました"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "設定が保存されました"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "設定が変更されませんでした"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4413,57 +4469,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "フォルダではありません"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "オーディオ・プレイヤー '%s' が見つかりません!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "タグを付与する"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "ファイル名とフォルダ名の変更"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "フィールドを編集する"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "タグのスキャンが完了しました..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "タグのスキャンが成功しました...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, fuzzy, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr "Tag scanner: 拡張子 '%s' は ファイル名 '%s' の中に見つかりません!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "スキャンエラー: セパレータ '%s' ('%s' の中にある) が見つかりません"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "ファイル '%s' をシステムのエンコーディングに変換できませんでした"
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "新しいファイル名のスキャンが完了しました..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "新しいファイル名のスキャンが完了しました...(%s)"
@@ -4471,41 +4527,41 @@ msgstr "新しいファイル名のスキャンが完了しました...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "タグとファイル名のスキャン"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "スキャナ :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "使用するスキャナのタイプを選択して下さい"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "スキャナ・ウィンドを開くか、指定したファイルをスキャンします"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "スキャナに関連するオプションです"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "マスクエディタの表示を ON/OFF します"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "凡例の表示を ON/OFF します"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4514,15 +4570,15 @@ msgstr ""
 "選択または入力して下さい (タグフィールドを埋めるときに使用します)"
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "タグの埋め込みのプレビュー..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "このパスをマスクする接頭子"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4535,15 +4591,15 @@ msgstr ""
 "て扱い、それ以外は相対パスとして扱います"
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "ファイル名変更のプレビュー..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "フィールドの選択:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4552,126 +4608,136 @@ msgstr ""
 "下さい。"
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "プロセスファイル名・フィールド"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "プロセスタイトル・フィールド"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "プロセスファイル・演奏者フィールド"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "プロセスファイル・演奏者フィールド"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "プロセスアルバム・フィールド"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "プロセス・ジャンル・フィールド"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "プロセスコメント・フィールド"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "プロセス・コンポーザ・フィールド"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "プロセス・オリジナルの演奏者フィールド"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "プロセス・ライセンス・フィールド"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "プロセス URL フィールド"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "プロセス・エンコーディング・フィールド"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "全て選択/選択解除"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "'_' と '%20' を ' ' に変換する"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "変換 :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "→"
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4679,7 +4745,7 @@ msgstr ""
 "アンダースコアまたは文字列 %20 を一つのスペースに置き換えます (例: 変換前"
 "='Text%20In%20An_Entry' 変換後='Text In An Entry')"
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4687,16 +4753,16 @@ msgstr ""
 "スペースを一つのアンダースコアに置き換えます (例: 変換前='Text In An Entry' "
 "変換後='Text_In_An_Entry')"
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr "文字列を逐次置換します。大文字と小文字は区別されます。"
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr "ローマ数字を検出します"
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4704,7 +4770,7 @@ msgstr ""
 "全てのフィールドの全ての文字を大文字に変換します (例: 変換前='Text IN AN "
 "entry' 変換後='TEXT IN AN ENTRY')"
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4712,7 +4778,7 @@ msgstr ""
 "全てのフィールドの全ての文字を小文字に変換します (例: 変換前='TEXT IN an "
 "entry' 変換後='text in an entry')"
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4720,7 +4786,7 @@ msgstr ""
 "全てのフィールドの最初の文字を大文字に、その他の文字を小文字置き換えます "
 "(例: 変換前='text IN An ENTRY' 変換後='Text in an entry')"
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4728,7 +4794,7 @@ msgstr ""
 "全てのフィールドの各単語の最初の文字を大文字に、その他の文字を小文字に置き換"
 "えます (例: 変換前='Text in an ENTRY' 変換後='Text In An Entry')"
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4736,15 +4802,15 @@ msgstr ""
 "小文字のローマ数字を大文字に変換します。例えば、 'ix. text in an entry' は "
 "'IX. Text In An Entry' となります。"
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "大文字の前にスペースを挿入する"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "重複するスペースまたはアンダースコアを削除する"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4752,7 +4818,7 @@ msgstr ""
 "単語間にあるスペースを全て削除します (例: 変換前='Text In An Entry' 変換後"
 "='TextInAnEntry')"
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4760,7 +4826,7 @@ msgstr ""
 "各大文字の前にスペースを挿入します (例: 変換前='TextInAnEntry' 変換後='Text "
 "In An Entry')"
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4771,183 +4837,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "凡例"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : 演奏者"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : 演奏者"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : アルバム"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : コメント"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : コンポーザ"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : ライセンス"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : ディスクの番号"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : エンコーディング"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ジャンル"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : 無視"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : トラック番号"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : 演奏者"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : トラック"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : タイトル"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : 制作年"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "マスク・エディタ"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "新しいマスクを作成します"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "このマスクを上に移動します"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "このマスクを下に移動します"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "マスクの複製を作成します"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "デフォルト・マスクを追加します"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "マスクを削除します"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "マスクを保存します"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "新しいマスク"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "複製: マスクが選択されていません!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "削除: マスクが選択されていません!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "上に移動: マスクが選択されていません!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "下に移動: マスクが選択されていません!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "エラー: 設定ファイルを保存できません: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "設定ファイル '%s' を開けません (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "デフォルトの設定をロード中..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "ファイル '%s' (%s) を生成または開けません"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "エラー: 一覧をファイルに書き込めません: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "デフォルトの 'タグを埋める' マスクをロード中..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "デフォルトの 'ファイル名変更' マスクをロード中..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "デフォルトの 'フォルダ名変更' マスクをロード中..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "エラー: 環境変数 $HOME が定義されていません!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "エラー: フォルダ '%s' を生成できません! (%s)"
@@ -5194,8 +5265,8 @@ msgstr "オーディオ・プレイヤー: '%s'"
 #~ "If a different charset is selected with 'Use non standard character set "
 #~ "for writing ID3 tags', it will be used instead of ISO-8859-1."
 #~ msgstr ""
-#~ "ID3v2 タグに Unicode 文字セットを使用します (ID3v1 は常にデフォルトの ISO-"
-#~ "8859-1 で保存されます)\n"
+#~ "ID3v2 タグに Unicode 文字セットを使用します (ID3v1 は常にデフォルトの "
+#~ "ISO-8859-1 で保存されます)\n"
 #~ "\n"
 #~ "\"ID3 タグを書き込む際に非標準の文字セットを使用する:\" で別の文字セットを"
 #~ "選択した場合、ISO-8859-1 の代わりにそれを使用します"
diff --git a/po/nl.gmo b/po/nl.gmo
index 42ec55f..c6a68c4 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index b1e79d4..54a193a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 1.99.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2004-11-21 19:20+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem at gnome.org>\n"
 "Language-Team: Dutch <nl at li.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 "interface maakt het taggen erg eenvoudig."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Duitse vertaling)"
 
@@ -116,111 +118,111 @@ msgstr "(Duitse vertaling)"
 msgid "(Serbian translation)"
 msgstr "(Duitse vertaling)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Commentaar"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Info..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Info"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(gecompileerd: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(gebruikt: GTK+ %d.%d.%d en id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Auteur: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Homepage: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Beschrijving:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "(Niet beschikbaar)"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Ondersteuning voor Ogg Vorbis-bestanden uitgeschakeld)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
@@ -228,33 +230,33 @@ msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Met dank aan"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Vertalingen:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Algemeen:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Wijzigingen"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Kan bestand '%s' (%s) niet openen"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr ""
@@ -264,491 +266,501 @@ msgstr ""
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Sorteren op  tag"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Sorteren op eigenschap"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Oplopend op bestandsnaam"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Aflopend op bestandsnaam"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Oplopend op aanmaakdatum"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Aflopend op aanmaakdatum"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Oplopend op tracknummer"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Aflopend op tracknummer"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Oplopend op titel"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Aflopend op titel"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Oplopend op artiest"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Aflopend op artiest"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Oplopend op artiest"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Aflopend op artiest"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Oplopend op album"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Aflopend op album"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Oplopend op jaar"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Aflopend op jaar"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Oplopend op genre"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Aflopend op genre"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Oplopend op commentaar"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Aflopend op commentaar"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Oplopend op componist"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Aflopend op componist"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Oplopend op originele artiest"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Aflopend op originele artiest"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Oplopend op copyright"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Aflopend op copyright"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Oplopend op URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Aflopend op URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Oplopend op encoder-naam"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Aflopend op encoder-naam"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Oplopend op bestandstype"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Aflopend op bestandstype"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Oplopend op bestandsgrootte"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Aflopend op bestandsgrootte"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Oplopend op duratie"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Aflopend op duratie"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Oplopend op bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Aflopend op bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Oplopend op sample-frequentie"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Aflopend op sample-frequentie"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Openen met..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Alles selecteren"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Niets selecteren"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Bestandsselectie omkeren"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Verwijderen"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Eerste bestand"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Eerste bestand"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Vo_rige bestand"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Vorige bestand"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "Vo_lgende bestand"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Volgende bestand"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Laatste bestand"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Laatste bestand"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "Bestanden _verwerken"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Bestanden verwerken"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "Tags ver_wijderen"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Tags verwijderen"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Ongedaan maken"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Ongedaan maken"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Opnieuw"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Opnieuw"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "Bestanden op_slaan"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Bestanden opslaan"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "_Force Saving File(s)"
 msgstr "Bestanden _verwerken"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "Force Saving File(s)"
 msgstr "Bestanden verwerken"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Ongedaan maken"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Opnieuw"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "Bestandsbe_heer"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Ga naar _persoonlijke map"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Ga naar homedirectory"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Ga naar standaardmap"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Ga naar homedirectory"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Ga naar homedirectory"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Ga naar homedirectory"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Ga naar _standaardmap"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Ga naar standaardmap"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Stel huidige _map in als standaardmap"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Stel huidige map in als standaardmap"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Boomstructuur | Artiest-Album"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Map hernoemen..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Map herladen"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Bladeren door map met ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "Boom in_vouwen"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Opnieuw inlezen"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "_Verwerkingsvenster"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "Tags _vullen..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Tags vullen..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 #, fuzzy
 msgid "_Rename File(s) and Directory ..."
 msgstr "Map hernoemen"
 
-#: src/bar.c:226
+#: src/bar.c:230
 #, fuzzy
 msgid "Rename File(s) and Directory ..."
 msgstr "Map hernoemen"
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Cosmetisch..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Velden verwerken..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "E_xtra"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Bestanden _zoeken..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Bestanden zoeken..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 #, fuzzy
 msgid "CD Data _Base Search ..."
 msgstr "CDDB doorzoeken..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB doorzoeken..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Bestandsnamen uit TXT lezen..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Afspeellijst opslaan..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Beluister nummers"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Instellingen"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Voorkeuren..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Voorkeuren..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Hulp"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Info"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Huidige actie afbreken"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "Bestandsopdrachten"
 
-#: src/bar.c:257
+#: src/bar.c:261
 #, fuzzy
 msgid "CDDB Search File(s)..."
 msgstr "Bestanden zoeken..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "_Submappen doorzoeken"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 #, fuzzy
 msgid "Show Hidden Directories"
 msgstr "Verborgen submappen doorzoeken"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Toon boomstructuur / Toon artiesten en albums"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Could not merge UI, error was: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Klaar om te beginnen..."
 
@@ -757,7 +769,7 @@ msgid "New default path for files selected"
 msgstr "Nieuwe standaardmap voor bestanden geselecteerd"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Bevestigen..."
 
@@ -769,92 +781,97 @@ msgstr ""
 "Sommige bestanden zijn aangepast, maar niet opgeslagen...\n"
 "Wilt u deze opslaan voor u de map verlaat?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "Albums"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Fout: Zoeken naar %s, kan node %s niet vinden in boomstructuur."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Boomstructuur"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Bestandsnaam"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Titel"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artiest"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Jaar"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Track"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Genre"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 #, fuzzy
 msgid "Composer"
 msgstr "Componist:"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 #, fuzzy
 msgid "Orig. Artist"
 msgstr "Orig. artiest:"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 #, fuzzy
 msgid "Copyright"
 msgstr "Copyright:"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Encoded door:"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "Albums"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "Bestanden"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Ga naar bovenliggende map"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Geef een map in om te bekijken."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Voer een mapnaam in om te bekijken."
@@ -862,35 +879,35 @@ msgstr "Voer een mapnaam in om te bekijken."
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u bestanden"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artiest & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Map hernoemen"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "De map '%s' hernoemen naar:"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Gebruik masker: "
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 #, fuzzy
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "Wanneer ingeschakeld zal de playlist bewaard worden in de bovenliggende map."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
@@ -899,32 +916,32 @@ msgstr ""
 "Selecteer of voer een masker in volgens de codes in de legenda, om zo de tag "
 "te vullen vanuit de bestandsnamen"
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Onjuist verwerkingsmasker"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Voorbeeld hernoemen..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Fout..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Je moet wel een naam invoeren!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -958,7 +975,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -967,7 +984,7 @@ msgstr ""
 "De map kan niet hernoemd worden omdat de mapnaam al bestaat!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -982,73 +999,73 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Map hernoemd"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Programma: "
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Geef het programma om uit te voeren.  De huidige map wordt als parameter "
 "meegegeven."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Openen met..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Geef het programma om uit te voeren.  Het huidige bestand wordt als "
 "parameter meegegeven."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Je moet wel een programmanaam invoeren!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kan '%s' (%s) niet uitvoeren\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Kan geen proces afsplitsen!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Commando uitgevoerd: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artiest / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Categorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Titel"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Duur:"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 #, fuzzy
 msgid "CD Data Base Search"
 msgstr "Doorzoek CDDB"
@@ -1056,16 +1073,16 @@ msgstr "Doorzoek CDDB"
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatisch zoeken"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 #, fuzzy
 msgid "Request CD database :"
 msgstr "CDDB database:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1073,16 +1090,16 @@ msgstr ""
 "CDDB database raadplegen aan de hand van de geselecteerde bestanden (de "
 "volgorde is belangrijk) om een CDDB-ID te verkrijgen"
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Zoeke afbreken..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1093,138 +1110,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Handmatig zoeken"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Zoektermen: "
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Geef de zoektermen in (gescheiden door een spatie of '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Zoeken in: "
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Alle velden"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Andere"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Alle categorieën"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klassiek"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diversen"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "New age"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclusief funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "films, shows"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "andere"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Categorieën"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Resultaten: "
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Zoeken: "
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Geef de zoektermen in de onderstaande lijst in"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Volgende zoeken"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Vorige zoeken"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Toon enkel rode lijnen / Toon alle lijnen"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Alle lijnen deselecteren"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Lijnselectie omkeren"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Alle lijnen selecteren"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 #, fuzzy
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
@@ -1237,36 +1254,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Plaats in: "
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Alles"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Tracknr."
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "Aantal tracks"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Verwerk ieder bestand met huidige instellingen"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1275,91 +1292,95 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Laad de geselecteerde lijnen of alle lijnen (indien geen geselecteerd)"
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Klaar om te zoeken..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Album: '%s', artiest: '%s', duur: '%s', jaar: '%s', genre: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Selectie omkeren"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Sorteer lijst volgens tracknummer"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Sorteer lijst volgens titel"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Opzoeken '%s'..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kan host '%s' (%s) niet vinden"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Kan geen nieuwe socket aanmaken (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Bezig met verbinden naar '%s', poort '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan geen verbinding maken met '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Verbonden met '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fout bij het verwijderen van ID3v1 tag van '%s' (%s)\n"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen\n"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Bezig met opzoeken ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kan niet opzoeken (%s)!"
@@ -1368,92 +1389,93 @@ msgstr "Kan niet opzoeken (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Bezig met inlezen resultaten ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "De server gaf een verkeerd antwoord! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "De server gaf een verkeerd antwoord! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d passende albums gevonden"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 #, fuzzy
 msgid "No file selected!"
 msgstr "Kopiëren: Geen rij geselecteerd!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%u bestanden"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Klaar om te zoeken..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Verzoek verzonden (CDDB-ID: %s, #nummers: %d, Totale lengte: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d passende albums gevonden"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Kan bestand '%s' (%s) niet openen"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Inlezen van albumtracklijst ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1466,7 +1488,7 @@ msgstr ""
 "\n"
 "Wilt u verder gaan?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Schrijf tag van CDDB..."
 
@@ -1730,7 +1752,7 @@ msgstr ""
 msgid "Browser"
 msgstr "Bestandsbeheer"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Bestand"
 
@@ -1744,11 +1766,11 @@ msgstr "Bestand niet gevonden"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1756,7 +1778,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1764,17 +1786,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1791,7 +1813,7 @@ msgid "Time:"
 msgstr "Tijdsduur:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Tag"
 
@@ -1821,46 +1843,57 @@ msgstr "Artiest:"
 msgid "Tag selected files with this artist"
 msgstr "Gebruik deze artiest voor geselecteerde bestanden"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artiest:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Gebruik deze artiest voor geselecteerde bestanden"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Gebruik albumtitel voor geselecteerde bestanden"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "CDDB"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 #, fuzzy
 msgid "Tag selected files with this disc number"
 msgstr "Gebruik deze componist voor geselecteerde bestanden"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Jaar:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Gebruik dit jaar voor geselecteerde bestanden"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Nummer alle tracks oplopend. Start in iedere submap opnieuw met 01."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Track:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1868,294 +1901,303 @@ msgstr ""
 "Vul het aantal bestanden in de directory van het geselecteerde bstand in als "
 "aantal tracks van het album."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Gebruik dit aantal tracks voor geselecteerde bestanden"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Gebruik dit genre voor geselecteerde bestanden"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Commentaar:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Gebruik dit commentaar voor geselecteerde bestanden"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Componist:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Gebruik deze componist voor geselecteerde bestanden"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Orig. artiest:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Gebruik deze originele artiest voor geselecteerde bestanden"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Gebruik dit copyright voor geselecteerde bestanden"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Gebruik deze URL voor geselecteerde bestanden"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Encoded door:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Gebruik deze encoder-naam voor geselecteerde bestanden"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr ""
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr ""
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr ""
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 #, fuzzy
 msgid "Tag selected files with these pictures"
 msgstr "Gebruik deze titel voor geselecteerde bestanden"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 #, fuzzy
 msgid "Remove selected pictures, else all pictures."
 msgstr "URL van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 #, fuzzy
 msgid "Save the selected pictures on the hard disk."
 msgstr "Tekenset voor bestanden op harde schijf."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 #, fuzzy
 msgid "Set properties of the selected pictures."
 msgstr "Titel '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Titel '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Titels van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Artiest '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Artiest van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Artiest '%s' is gebruikt voor geselecteerde bestanden."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Artiest van geselecteerde bestanden verwijderd."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Album '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Album van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, fuzzy, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Componist '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 #, fuzzy
 msgid "Removed disc number from selected files."
 msgstr "Tracknummer van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Jaar '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Jaar van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Het tracknummer werd in geselecteerde bestanden genoteerd als 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Het tracknummer werd in geselecteerde bestanden genoteerd als 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Tracknummer van geselecteerde bestanden verwijderd."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Geslecteerde tracks zijn oplopend genummerd."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Genre '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Genre van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Commentaar '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Commentaar van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Componist '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Componist van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Originele artiest '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Originele artiest van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Copyright '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Copyright van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "URL '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "URL van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Encoder-naam '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Encoder-naam van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 #, fuzzy
 msgid "Selected files tagged with pictures."
 msgstr "Titel '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 #, fuzzy
 msgid "Removed pictures from selected files."
 msgstr "Titels van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Selecteer mode en masker en herhaal de actie"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Alle tags zijn verwerkt"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Alle tags zijn verwijderd"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Bestanden zoeken..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Alle bestanden zijn bewaard..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "De bestanden zijn gedeeltelijk gewist..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Alle bestanden zijn gewist..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2164,17 +2206,17 @@ msgstr ""
 "Wilt u de tag van het bestand\n"
 "'%s' opslaan?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Tag op opslaan..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 #, fuzzy
 msgid "Rename File and Directory..."
 msgstr "Map hernoemen"
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2188,12 +2230,12 @@ msgstr ""
 "'%s' hernoemen?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "Map hernoemen..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2207,11 +2249,11 @@ msgstr ""
 "'%s' hernoemen?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Bestand hernoemen..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2224,17 +2266,17 @@ msgstr ""
 "naar \n"
 "'%s' hernoemen?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Tag van '%s' aan het schrijven"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Tags opgeslagen"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2243,21 +2285,21 @@ msgstr ""
 "Kan tag niet opslaan in bestand: '%s' !\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Kan tag niet opslaan in bestand: '%s' !\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Hernoemen bestand '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2271,7 +2313,7 @@ msgstr ""
 "'%s'.\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2281,11 +2323,11 @@ msgstr ""
 "'%s'.\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Bestanden niet hernoemd..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2299,7 +2341,7 @@ msgstr ""
 "'%s'\n"
 "al bestaat."
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2309,7 +2351,7 @@ msgstr ""
 "'%s'\n"
 "al bestaat."
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, fuzzy, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2320,7 +2362,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2329,16 +2371,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Het bestand '%s' is hernoemd naar '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Bestanden hernoemd..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2349,7 +2391,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2358,18 +2400,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Het bestand '%s' is hernoemd naar '%s'\n"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "Bestanden hernoemd..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2383,7 +2425,7 @@ msgstr ""
 "'%s'.\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2393,12 +2435,12 @@ msgstr ""
 "'%s'.\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "Bestanden niet hernoemd..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2408,16 +2450,16 @@ msgstr ""
 " '%s'\n"
 "wilt verwijderen?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Verwijder bestand..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Bestand '%s' gewist"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2429,109 +2471,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Bezig met zoeken..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Bestand: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "%d bestanden gevonden in deze map en submappen"
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "%d bestanden gevonden in deze map"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u bestanden"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Deze map en de submappen bevatten geen bestanden!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Deze map bevat geen bestanden!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  STOP met zoeken...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Voer een mapnaam in om te bekijken."
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Gebruik dit veld voor geselecteerde bestanden"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converteer '_' en '%20' naar spaties"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Converteer ' ' naar '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Allemaal hoofdletters"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Allemaal kleine letters"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Eerste letter hoofdletter"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Iedere eerste letter hoofdletter"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Verwijder spaties"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Voeg spatie toe voor iedere hoofdletter"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Verwijder dubbele spaties of underscores"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: afgebroken! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Signaal ontvangen: %s (%d)\a\n"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2542,11 +2583,11 @@ msgstr ""
 "met debuginformatie ('gdb easytag core' gevolgd door 'bt' en 'l') te zenden "
 "naar easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Onbekend signaal"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2579,11 +2620,11 @@ msgstr ""
 "., ./                  De huidige map laden.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: normaal afgesloten! Tot ziens..."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2591,85 +2632,85 @@ msgstr ""
 "Sommige bestanden zijn aangepast maar niet opgeslagen...\n"
 "Wilt u deze opslaan voor u het programma verlaat?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Wilt u EasyTAG werkelijk verlaten?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3-tag"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis-tag"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis-tag"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE-tag"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3-bestand"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2-bestand"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis-bestand"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "Volgende bestand"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC-bestand"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack-bestand"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio-bestand"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "MP2-bestand"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "MusePack-bestand"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr ""
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2677,14 +2718,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2695,11 +2736,11 @@ msgstr ""
 "naar systeemcodering (Probeer de \n"
 "omgevingsvariabele G_FILENAME_ENCODING eens in te stellen): '%s'"
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Bestandsnaam vertalingen"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2724,56 +2765,56 @@ msgstr "Encoder:"
 msgid "Channels:"
 msgstr "Wijzigingen"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "FOUT tijdens het openen van bestand: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FOUT: Kan commentaar niet opslaan in bestand: %s (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Tag weggeschreven van '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Tag verwijderd van '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fout bij het verwijderen van ID3v1 tag van '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fout bij het verwijderen van ID3v2 tag van '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fout bij het aanpassen van ID3v2 tag van '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2788,84 +2829,84 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fout bij het aanpassen van ID3v1 tag van '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Tag aangepast van '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Geen fouten gemeld"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Geen geheugen vrij"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Geen gegevens te verwerken"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Onjuist geformatteerde data"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Geen buffer om in te schrijven"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Buffer is te klein"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Ongeldig frame ID"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Veld niet gevonden"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Onbekend veldtype"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Tag is al gekoppeld aan een bestand"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Ongeldige versie van tag"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Geen bestand om te verwerken"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Poging tot schrijven naar alleen-lezen bestand"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Fout bij compressie/decompressie"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Onbekende fout!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "Selecteer bestand..."
@@ -2874,75 +2915,75 @@ msgstr "Selecteer bestand..."
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Selecteer bestand..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Selecteer map..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "Bezig met zoeken..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Kan '%s' (%s) niet uitvoeren\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Creëer playlist"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3U-playlistnaam"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Gebruik mapnaam"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Bewerk maskers"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Playlist-instellingen"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Alleen geselecteerde bestanden meetellen"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2950,30 +2991,30 @@ msgstr ""
 "Indien waar, zullen alleen de geselecteerde bestanden in de afspeellijst "
 "gezet worden, anders wordt alles toegevoegd."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Gebruik volledig pad voor bestanden in lijst"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Gebruik relatief pad voor bestanden in lijst"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Maak playlist in bovenliggende map"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Wanneer ingeschakeld zal de playlist bewaard worden in de bovenliggende map."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Gebruik DOS directory scheidingsteken"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2981,23 +3022,23 @@ msgstr ""
 "Deze optie vervangt het UNIX directory scheidingsteken '/' door dat van DOS "
 "'\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Playlist inhoud"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Bewaar enkel lijst met bestanden"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Gebruik bestandsnaam om te bewaren"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Bewaar info gebruik makend van: "
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -3006,12 +3047,12 @@ msgstr ""
 "Playlist bestand '%s' bestaat reeds!\n"
 "Overschrijven?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Sla playlist op..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -3020,120 +3061,120 @@ msgstr ""
 "Kan playlist niet opslaan in bestand: %s!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Playlist weggeschreven van '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 #, fuzzy
 msgid "CD"
 msgstr "CDDB"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 #, fuzzy
 msgid "Encoded by"
 msgstr "Encoded door:"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Zoek bestand"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "In :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 #, fuzzy
 msgid "the File Name"
 msgstr "Bestandsnaam"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 #, fuzzy
 msgid "the Tag"
 msgstr "Tag op opslaan..."
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "%d bestanden gevonden"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Laad bestandsnamen uit tekstbestand"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Bestand :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr "Laden "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Bevestiging voor het hernoemen van bestanden"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Voeg een spatie in voor iedere hoofdletter"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Lijn wissen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Wis alle lege lijnen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Alleen geselecteerde bestanden meetellen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Alleen geselecteerde bestanden meetellen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Herladen"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Bewaar enkel lijst met bestanden"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Alle lijnen selecteren"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3141,20 +3182,20 @@ msgstr ""
 "Deze optie zorgt ervoor dat de bestanden worden verwerkt zodra de "
 "bestandsnamen zijn ingelezen (het verwerkingsvenster moet geopend zijn)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Witregel invoegen"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Lijn wissen"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Verplaats masker naar boven in lijst"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Verplaats masker naar beneden in lijst"
@@ -3236,12 +3277,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FOUT tijdens het openen van bestand: '%s'als vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Opgelet: HEt Ogg Vorbis-bestand '%s' bevat een ID3v2-tag."
@@ -3839,7 +3880,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3852,7 +3893,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -4006,24 +4047,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Codering voor ID3-tags."
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Gebruik ID3v2-tags"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Gebruik ID3v2-tags"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -4033,12 +4085,12 @@ msgstr ""
 "toegevoegd. Anders wordien zij verwijderd."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "Beschrijving:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4047,64 +4099,64 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Encoded door:"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 #, fuzzy
 msgid "Character set used to write the tag data in the file."
 msgstr "Karakterset voor weergave op het scherm."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr " Nee "
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3-tag"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Gebruik ID3v1.x-tags"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4112,30 +4164,30 @@ msgstr ""
 "Wanneer aangevinkt, zullen er aan de MP3 bestanden ID3v1-tags worden "
 "toegevoegd. Anders worden zij verwijderd."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Karakterset voor weergave op het scherm."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Codering voor ID3-tags."
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4144,7 +4196,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 #, fuzzy
 msgid "Character set used to read tag data in the file."
 msgstr "Karakterset voor weergave op het scherm."
@@ -4152,24 +4204,24 @@ msgstr "Karakterset voor weergave op het scherm."
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Verwerkingsvenster"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Verwerkingsvenster - Tekenconversie"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Converteer '_' en '%20' naar spatie ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converteer spatie ' ' naar underscore '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4178,11 +4230,11 @@ msgstr ""
 "toepassen van een masker op tags."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Bestanden hernoemen - Tekenconversie"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4191,18 +4243,18 @@ msgstr ""
 "toepassen van een masker op bestandsnamen."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Cosmetisch - Tekenconversie"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 #, fuzzy
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Niet alle eerste letters omzetten naar hoofdletters."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4211,25 +4263,25 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Verwerkingsvenster"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Verwerkingsvenster openen bij starten"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "Open automatisch het verwerkingsvenster bij het opstarten van EasyTAG."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Verwerkingsvenster altijd bovenop"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4238,16 +4290,16 @@ msgstr ""
 "hoofdvenster."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Velden"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Overschrijf velden bij het verwerken van de bestanden"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4256,11 +4308,11 @@ msgstr ""
 "door de nieuwe tekst.  Wanneer uitgeschakeld, worden alleen de lege velden "
 "gevuld."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Gebruik deze tekst als standaard voor het commentaarveld :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4268,11 +4320,11 @@ msgstr ""
 "Wanneer ingeschakeld wordt standaard deze tekst gebruikt als commentaar."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "Gebruik CRC32-waarde als standaardcommentaar (enkel voor ID3-tags)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4283,46 +4335,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Automatisch zoeken"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Naam: "
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Poort: "
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI-pad: "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Instellingen server"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Doorzoek CDDB"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "CGI-pad: "
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4331,66 +4383,66 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Proxy"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Gebruik een proxyserver"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Activeer de instellingen van de proxyserver."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Computernaam: "
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Naam van de proxyserver."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Poort van de proxyserver."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Gebruikersnaam: "
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Naam van de gebruiker van de proxyserver."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Wachtwoord: "
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Wachtwoord van de gebruiker van de proxyserver."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 #, fuzzy
 msgid "Track Name List"
 msgstr "Titel"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
 msgstr ""
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4399,71 +4451,75 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Bevestiging"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Bevestiging voor het afsluiten van EasyTAG"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "Indien ingeschakeld moet u het afsluiten van EasyTAG bevestigen."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Bevestiging voor het opslaan van tags"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Bevestiging voor het hernoemen van bestanden"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Bevestiging voor het wissen van bestanden"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Bevestiging voor het opslaan van playlists"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Veranderingen toepassen (maar niet opslaan!) en sluit dit venster"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Sluit dit venster zonder de veranderingen op te slaan"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Sla veranderingen op en sluit dit venster"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Veranderingen toegepast"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Voorkeuren opgeslagen"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Voorkeuren onveranderd"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4474,58 +4530,58 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Het is geen map"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Vul tag"
 
-#: src/scan.c:180
+#: src/scan.c:181
 #, fuzzy
 msgid "Rename File and Directory"
 msgstr "Map hernoemen"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Cosmetisch"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Tag succesvol verwerkt..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag succesvol verwerkt...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Probleem: kan het scheidingsteken '%s' in '%s' niet vinden"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Kan bestandsnaam '%s' niet omzetten naar systeemcodering."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Nieuw bestand succesvol verwerkt..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nieuw bestand succesvol verwerkt...(%s)"
@@ -4533,41 +4589,41 @@ msgstr "Nieuw bestand succesvol verwerkt...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Bewerk tags en bestandsnamen"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Bewerking:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Selecteer de bewerking"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Open verwerkingsvenster / Geselecteerde bestanden verwerken"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Instellingen verwerkingsvenster"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Verbergen / Weergeven maskerbewerking"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Verbergen / Weergeven legenda"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Sluit dit venster"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4576,15 +4632,15 @@ msgstr ""
 "te vullen vanuit de bestandsnamen"
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Voorbeeld van ingevulde tag..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
@@ -4596,15 +4652,15 @@ msgstr ""
 "bestandsnaam aan te passen op basis van de tag."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Voorbeeld hernoemen..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Selecteer velden:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4613,131 +4669,141 @@ msgstr ""
 "worden. Selecteer degene die u interesseren."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "B"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Bestandsnaam veld"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Titel veld"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Artiest veld"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Artiest veld"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Album veld"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Verwerk genre veld"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Componist veld"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 #, fuzzy
 msgid "Process original artist field"
 msgstr "Artiest veld"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 #, fuzzy
 msgid "Cr"
 msgstr "C"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 #, fuzzy
 msgid "Process copyright field"
 msgstr "Commentaar veld"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 #, fuzzy
 msgid "Process URL field"
 msgstr "Titel veld"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 #, fuzzy
 msgid "Process encoder name field"
 msgstr "Bestandsnaam veld"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Selectie omkeren"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Selecteer alles/niets."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Vervang '_' en '%20' door ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Zet om :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "naar : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4745,7 +4811,7 @@ msgstr ""
 "Converteer '_' en '%20' naar spaties (bv: 'Een%20stukje_Tekst' wordt 'Een "
 "stukje Tekst')."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4753,16 +4819,16 @@ msgstr ""
 "De spatie wordt vervangen door een underscore (bv: 'Een stukje tekst' wordt "
 "'Een_stukje_tekst')."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4770,7 +4836,7 @@ msgstr ""
 "Alle letters worden hoofdletters (bv 'Een STUKJE tekst' wordt 'EEN STUKJE "
 "TEKST')."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4778,7 +4844,7 @@ msgstr ""
 "Alle letters worden hoofdletters (bv 'Een STUKJE tekst' wordt 'EEN STUKJE "
 "TEKST')."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4786,7 +4852,7 @@ msgstr ""
 "De eerste letter van een zin wordt een hoofdletter en de rest kleine letters "
 "(bv 'een STUKJE Tekst' wordt 'Een stukje tekst')."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4794,7 +4860,7 @@ msgstr ""
 "De eerste letter van ieder woord wordt een hoofdletter en de rest kleine "
 "letters (bv 'een STUKJE Tekst' wordt 'Een Stukje Tekst')."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4803,22 +4869,22 @@ msgstr ""
 "Voor iedere hoofdletter wordt een spatie geplaatst. (bv: 'EenStukjeTekst' "
 "wordt 'Een Stukje Tekst')."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Voeg een spatie in voor iedere hoofdletter"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Verwijder dubbele spaties en underscores"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 "Alle spaties verwijderen. (bv 'Een Stukje Tekst' wordt 'EenStukjeTekst')."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4826,7 +4892,7 @@ msgstr ""
 "Voor iedere hoofdletter wordt een spatie geplaatst. (bv: 'EenStukjeTekst' "
 "wordt 'Een Stukje Tekst')."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4837,185 +4903,190 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artiest"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : artiest"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commentaar"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, fuzzy, c-format
 msgid "%p : composer"
 msgstr "%c : commentaar"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, fuzzy, c-format
 msgid "%e : encoded by"
 msgstr "Encoder:"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : genegeerd"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l: aantal tracks"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, fuzzy, c-format
 msgid "%o : orig. artist"
 msgstr "%a : artiest"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : tracknummer"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : jaar"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Maskerbewerking"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Maak nieuw masker"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Verplaats masker naar boven in lijst"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Verplaats masker naar beneden in lijst"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Kopieer Masker"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Voeg standaardmaskers toe"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Verwijder masker"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Sla maskers op"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nieuw masker"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Kopiëren: Geen rij geselecteerd!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Verwijderen: Geen rij geselecteerd!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Naar boven: Geen rij geselecteerd!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Naar beneden: Geen rij geselecteerd!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FOUT: Kan voorkeuren niet opslaan: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan voorkeuren niet openen '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Voorkeuren worden geladen..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, fuzzy, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "FOUT: Kan lijst niet opslaan: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "FOUT: De omgevingsvariabele HOME is niet gedefinieerd!\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FOUT: Kan de map '%s' niet aanmaken (%s)!"
diff --git a/po/pl.gmo b/po/pl.gmo
index eef7631..036bf69 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index d92fc33..9b5fb3b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -18,10 +18,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-2.1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2008-02-22 12:04+0100\n"
 "Last-Translator: Micha³ Smoczyk <msmoczyk at wp.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,6 +40,7 @@ msgstr ""
 "³atwiejsze pod GNU/Linuksem."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Niemieckie t³umaczenie)"
 
@@ -118,138 +120,138 @@ msgstr "(Hebrajskie t
 msgid "(Serbian translation)"
 msgstr "(Serbskie t³umaczenie)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "Nazwa rozszerzenia"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "Stan"
 
 # To musi byæ krotkie
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Komentarz"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Informacje o..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Informacje o"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompilacja: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(u¿ywanie: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Strona WWW: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Opis:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "Wsparcie dla plików MP3"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "w³±czone"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "wy³±czone"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "Wsparcie dla tagów ID3v2.3"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "w³±czone"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Wsparcie dla plików Ogg Vorbis"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Wsparcie dla plików Speex"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "Wsparcie dla plików FLAC"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "Wsparcie dla plików MP4/AAC"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "Wsparcie dla plików WavPack"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Podziêkowania"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "T³umaczenia:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Ogólne:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Zmiany"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Nie mo¿na otworzyæ pliku \"%s\" (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "B£¡D podczas otwierania pliku: \"%s\" (%s)."
@@ -257,485 +259,495 @@ msgstr "B
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Plik"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Sortuj listê po tagach"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Sortuj listê po w³a¶ciwo¶ci"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Sortuj listê wed³ug nazw plików"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Malej±co wed³ug nazw plików"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Rosn±co wed³ug daty utworzenia"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Malej±co wed³ug daty utworzenia"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Rosn±co wed³ug numeru ¶cie¿ki"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Malej±co wed³ug numeru ¶cie¿ki"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Rosn±co wed³ug tytu³u"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Malej±co wed³ug tytu³u"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Rosn±co wed³ug artysty"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Malej±co wed³ug artysty"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Rosn±co wed³ug artysty"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Malej±co wed³ug artysty"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Rosn±co wed³ug albumu"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Malej±co wed³ug albumu"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Rosn±co wed³ug roku"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Malej±co wed³ug roku"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Rosn±co wed³ug gatunku"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Malej±co wed³ug gatunku"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Rosn±co wed³ug komentarza"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Malej±co wed³ug komentarza"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Rosn±co wed³ug kompozytora"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Malej±co wed³ug kompozytora"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Rosn±co wed³ug artysty"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Malej±co wed³ug artysty"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Rosn±co wed³ug praw autorskich"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Malej±co wed³ug praw autorskich"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Rosn±co wed³ug URLa"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Malej±co wed³ug URLa"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Rosn±co wed³ug imienia koduj±cego"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Malej±co wed³ug imienia koduj±cego"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Rosn±co wed³ug typu pliku"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Malej±co wed³ug typu pliku"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Rosn±co wed³ug rozmiaru pliku"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Malej±co wed³ug rozmiaru pliku"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Rosn±co wed³ug czasu trwania"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Malej±co wed³ug czasu trwania"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Rosn±co wed³ug próbkowania"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Malej±co wed³ug próbkowania"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Rosn±co wed³ug czêstotliwo¶ci"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Malej±co wed³ug czêstotliwo¶ci"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Otwórz plik(i) za pomoc± ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Zaznacz wszystkie pliki"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Odznacz wszystkie pliki"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Odwróæ zaznaczenie"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Usuñ plik(i)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "P_ierwszy plik"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "P_ierwszy plik"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Pop_rzedni plik"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Pop_rzedni plik"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Nastêpny plik"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "_Nastêpny plik"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Ostatni plik"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "_Ostatni plik"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "Skanuj plik(i)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Skanuj plik(i)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "Usuñ Tag(i)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Usuñ Tag(i)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "Cofnij ostatnie zmiany w pliku"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Cofnij ostatnie zmiany w pliku"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "Prz_ywróæ ostatnie zmiany w pliku"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Prz_ywróæ ostatnie zmiany w pliku"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "Zapi_sz plik(i)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Zapi_sz plik"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "Wymu¶ zapisanie pliku(ów)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Wymu¶ zapisanie pliku(ów)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Cofnij ostatnie zmiany"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Przywróæ ostatnie zmiany"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Zakoñcz"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Zakoñcz"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Przegl±darka"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Id¼ do katalogu domowego"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Id¼ do katalogu domowego"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Id¼ do katalogu domy¶lnego"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Id¼ do katalogu domowego"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Id¼ do katalogu domowego"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Id¼ do katalogu domowego"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Id¼ do katalogu domy¶lnego"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Id¼ do katalogu domy¶lnego"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Ustaw bie¿±c± ¶cie¿kê jako domy¶ln±"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Ustaw bie¿±c± ¶cie¿kê jako domy¶ln±"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Widok drzewa | Widok artysta-album"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Zmieñ nazwê katalogu..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Ponownie wczytaj katalog"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Przegl±daj katalog za pomoc±..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "Zwiñ drzewo"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "Od¶wie¿ drzewo"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "_Skaner"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "Wype³nij tagi..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Wype³nij tagi..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "Zmieñ nazwê pliku/katalogu ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Zmieñ nazwê pliku/katalogu..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "Przetwarzaj pola ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Przetwarzaj pola ..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Ró¿ne"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Szukaj pliku..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Szukaj pliku..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Wyszukiwanie w CDDB ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "Wyszukiwanie w CDDB ..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Wczytaj nazwy z pliku TXT..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Zapis listy odtwarzania..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Uruchom odtwarzacz audio"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Ustawienia"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Preferencje..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "_Preferencje..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "Informacje o"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Zatrzymaj obecn± akcjê"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "Opcje na plikach"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Szukaj pliku w CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Wyczy¶æ dziennik"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Przegl±daj podkatalogi"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Poka¿ ukryte katalogi"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Wy¶wietl widok drzewa / Wy¶wietl widok artysty i albumu"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Nie mo¿na scaliæ UI, b³±d: %s\n"
 
 # odt±d
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Gotowy do pracy..."
 
@@ -744,7 +756,7 @@ msgid "New default path for files selected"
 msgstr "Wybrano now± domy¶ln± ¶cie¿kê do plików"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Potwierd¼..."
 
@@ -756,119 +768,124 @@ msgstr ""
 "Czê¶æ plików zosta³a zmodyfikowana ale zmiany nie zosta³y zapisane.\n"
 "Czy zapisaæ te zmiany przed zmian± katalogu?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Wszystkie albumy>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "B³±d: Szukano %s, nie mo¿na znale¼æ ga³êzi %s na drzewie."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Drzewo"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Nazwa pliku"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Tytu³"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artysta"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artysta"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Rok"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "¦cie¿ka"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Gatunek"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Artysta"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 msgid "Encoded By"
 msgstr "Koder"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Pliki"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Id¼ do katalogu nadrzêdnego"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Podaj katalog do przegl±dania."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 msgid "Select a directory to browse."
 msgstr "Wybierz katalog do przegl±dania."
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u plik(ów)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artysta i Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Zmiana nazwy katalogu"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Zmiana nazwy katalogu \"%s\" na: "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Maska :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Je¿eli w³±czone, u¿yje maski do zmiany nazwy katalogu."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -876,31 +893,31 @@ msgstr ""
 "Wybierz lub wprowad¼ maskê u¿ywaj±c kodów (zobacz Legendê) aby przetworzyæ "
 "nazwê pliku i ¶cie¿kê. U¿ywane do wype³niania pól tagów."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Nieprawid³owa maska skanera"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Podgl±d zmiany nazwy katalogu..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "B³±d..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Musisz wprowadziæ nazwê katalogu!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -935,7 +952,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -944,7 +961,7 @@ msgstr ""
 "Zmiana nazwy katalogu nie jest mo¿liwa. Katalog ju¿ istnieje!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -959,87 +976,87 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Nazwa katalogu zmieniona"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Program do uruchomienia :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Podaj nazwê programu do uruchomienia. Otrzyma on aktualny katalog jako "
 "parametr."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Otwórz plik za pomoc± ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Podaj nazwê programu do uruchomienia. Otrzyma on wybrany plik jako parametr."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Musisz podaæ nazwê programu!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Aplikacja \"%s\" nie zosta³a znaleziona!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nie mo¿na uruchomiæ %s (b³±d %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Nie mo¿na utworzyæ procesu potomnego!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Wykonano polecenie: \"%s %s\""
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artysta / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Kategoria"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Nazwa ¶cie¿ki"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Czas"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Wyszukiwanie w CDDB"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatyczne wyszukiwanie"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "¯±dana baza danych CD :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1047,16 +1064,16 @@ msgstr ""
 "¯±daj automatycznie danych z CDDB u¿ywaj±c zaznaczonych plików (kolejno¶æ "
 "jest wa¿na!) aby wygenerowaæ CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Zatrzymaj wyszukiwanie ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "U¿yj lokalnej Cddb"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1067,15 +1084,15 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Manualne wyszukiwanie"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "S³owa :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 "Pole do wprowadzania szukanej frazy (s³owa oddzielone spacj± lub \"+\")"
@@ -1083,122 +1100,122 @@ msgstr ""
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Wyszukiwanie w :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Wszystkie pola"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Inne"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Wszystkie kategorie"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klasyczna"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Ró¿ne"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "¦cie¿ka filmowa"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "kategoria zawiera: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "filmy, przedstawienia"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "Wszystkie pozosta³e nie wyszczególnione w powy¿szych kategoriach"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Kategorie "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Wyniki :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Szukaj :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Wyszukiwanie w li¶cie poni¿ej"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Szukaj nastêpny"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Szukaj poprzedni"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Pokazuje czerwone / wszystkie linie na li¶cie \"Artysta / Album\""
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Odznacza wszystkie linie"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Odwraca zaznaczenie linii"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Zaznacz wszystkie linie"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1212,36 +1229,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Ustaw w :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Wszystkie"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "# ¦cie¿ki"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# ¦cie¿ek"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Uruchom skaner dla ka¿dego pliku"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Dopasuj linie wed³ug algorytmu Levenshteina"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1255,15 +1272,15 @@ msgstr ""
 "przy zaznaczaniu odpowiedniego pliku audio lub zatwierdzaniu wyników cddb, "
 "zamiast u¿ywania kolejno¶ci pozycji."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Wczytuj wybrane linie lub wszystkie linie (je¶li ¿adnych nie wybrano)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Gotowy do wyszukiwania..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1271,76 +1288,80 @@ msgstr ""
 "Album \"%s\", artysta: \"%s\", d³ugo¶æ: \"%s\", rok: \"%s\", gatunek: \"%s"
 "\", ID: \"%s\""
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Odwróæ zaznaczenie"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Sortuj wed³ug numeru ¶cie¿ki"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Sortuj wed³ug nazwa ¶cie¿ki"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Wyszukiwanie serwera \"%s\" ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nie mo¿na znale¼æ serwera \"%s\" (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Nie mo¿na utworzyæ nowego gniazda (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "£±czenie z serwerem \"%s\", port \"%d\" ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nie mo¿na po³±czyæ siê z serwerem \"%s\" (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Po³±czony z serwerem \"%s\""
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Odbieranie danych (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "B³±d podczas odczytywania odpowiedzi CDDB: %s!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nie mo¿na utworzyæ pliku \"%s\" (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nie mo¿na otworzyæ pliku \"%s\" (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Wysy³anie zapytania ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nie mo¿na wys³aæ zapytania (%s)!"
@@ -1349,62 +1370,63 @@ msgstr "Nie mo
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Odbieranie danych ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Serwer zwróci³ z³± odpowied¼!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serwer zwróci³ z³± odpowied¼! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Przykro mi, przeszukiwanie www nie dzia³a w tym momencie!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Znaleziono %d pasuj±cy(ch) album(ów)"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Odbieranie danych ze strony %d (album %d/%d) ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Odbieranie danych ze strony %d ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Wiêcej wyników do wczytania ..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Nie wybrano pliku!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Wybrano wiêcej ni¿ 99 plików! Nie mo¿na wys³aæ zapytania!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d plików zaznaczonych!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Gotowy do wyszukiwania..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
@@ -1412,28 +1434,28 @@ msgstr ""
 "Nie zdefiniowano ¶cie¿ki do lokalnej bazy CDDB!\n"
 "Wprowad¼ j± w oknie ustawieñ zanim u¿yjesz wyszukiwania."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Wysy³anie zapytania (CddbId: %s, # ¶cie¿ki: %d, d³ugo¶æ dysku: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Znaleziono %d pasuj±cy(ch) album(ów) dla DiscID \"%s\""
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Nie mo¿na wczytaæ pliku \"%s\" (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Wczytywanie listy ¶cie¿ek albumu ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1445,7 +1467,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ ?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Zapisz tagi z CDDB..."
 
@@ -1704,7 +1726,7 @@ msgstr "Nieznany parametr lub 
 msgid "Browser"
 msgstr "Przegl±darka"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Plik"
 
@@ -1718,11 +1740,11 @@ msgstr "Uszkodzony odno
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Warstwa ?"
 
@@ -1731,7 +1753,7 @@ msgstr "?, Warstwa ?"
 msgid "Bitrate:"
 msgstr "Próbkowanie:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1739,17 +1761,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Czêstotliwo¶æ:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Tryb:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1767,7 +1789,7 @@ msgstr "Czas:"
 
 # "Znacznik" ?
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Tag"
 
@@ -1799,39 +1821,51 @@ msgid "Tag selected files with this artist"
 msgstr ""
 "Artysta z tego pola zostanie wstawiony do pozosta³ych zaznaczonych plików"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artysta:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr ""
+"Artysta z tego pola zostanie wstawiony do pozosta³ych zaznaczonych plików"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr ""
 "Nazwa albumu z tego pola zostanie wstawiona do pozosta³ych zaznaczonych "
 "plików"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr ""
 "Numer dysku z tego pola zostanie wstawiony do pozosta³ych zaznaczonych plików"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Rok:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Rok z tego pola zostanie wstawiony do pozosta³ych zaznaczonych plików"
 
 #  numeruj po koleji wszystkie pliki. Zaczynaj od 01 w ka¿dym podkatalogu.
 #                 ^ koleji?:P
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Nadaje wszystkim plikom kolejne numery ¶cie¿ek. Zaczyna od 01 w ka¿dym "
@@ -1839,12 +1873,12 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "¦cie¿ka #:"
 
 # TODO cos tu nie gra
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1852,29 +1886,29 @@ msgstr ""
 "Ustaw liczbê plików w tym samym katalogu co wy¶wietlany plik jako liczbê "
 "¶cie¿ek."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 "Numer ¶cie¿ki z tego pola zostanie wstawiony do pozosta³ych zaznaczonych "
 "plików"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Gatunek:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr ""
 "Gatunek z tego pola zostanie wstawiony do pozosta³ych zaznaczonych plików"
 
 # "Komentarz:\n"
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr ""
 "Komentarz z tego pola zostanie wstawiony do pozosta³ych zaznaczonych plików"
@@ -1882,52 +1916,52 @@ msgstr ""
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Kompozytor:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr ""
 "Kompozytor z tego pola zostanie wstawiony do pozosta³ych zaznaczonych plików"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Oryginalny artysta:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr ""
 "Oryginalny artysta z tego pola zostanie wstawiony do pozosta³ych "
 "zaznaczonych plików"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr ""
 "Prawa autorskie z tego pola zostan± wstawione do pozosta³ych zaznaczonych "
 "plików"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "URL z tego pola zostan± wstawione do pozosta³ych zaznaczonych plików"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Skompresowany przez:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr ""
 "Imiê osoby, przez któr± plik zosta³ utworzony z tego pola zostanie wstawione "
@@ -1936,222 +1970,232 @@ msgstr ""
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Obrazy"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Obrazy:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Mo¿esz przeci±gn±æ i upu¶ciæ obrazy tutaj."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Wstaw dane obrazy do pozosta³ych zaznaczonych plików"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Dodaj obrazy do pliku (przeci±gnij i upu¶æ dozwolone)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 "Usuñ zaznaczone obrazy, w przypadku braku zaznaczenia usuñ wszystkie obrazy."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Zapisz zaznaczone obrazy na twardym dysku."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Zmieñ w³a¶ciwo¶ci zaznaczonych obrazów."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Zaznaczonym plikom ustawiono tytu³ \"%s\"."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Usuniêto tytu³y zaznaczonym plikom."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono artysta na \"%s\"."
 
 # TODO
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Usuniêto artystê z zaznaczonych plików."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Zaznaczonym plikom ustawiono artysta na \"%s\"."
+
+# TODO
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Usuniêto artystê z zaznaczonych plików."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Zaznaczonym plikom ustawiono album na \"%s\"."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Usuniêto album z zaznaczonych plików."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Zaznaczonym plikom ustawiono numer dysku na \"%s\"."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Usuniêto numer dysku z zaznaczonych plików."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Zaznaczonym plikom ustawiono rok na \"%s\"."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Usuniêto rok z zaznaczonych plików."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Zaznaczonym plikom ustawiono numer ¶cie¿ki na \"xx/%s\"."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Zaznaczonym plikom ustawiono numer ¶cie¿ki na \"xx\"."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Usuniêto numer ¶cie¿ki z zaznaczonych plików."
 
 # TODO
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Zaznaczone pliki ponumerowano wed³ug kolejno¶ci."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Zaznaczonym plikom ustawiono gatunek na \"%s\"."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Usuniêto gatunek z zaznaczonych plików."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Zaznaczonym plikom ustawiono komentarz na \"%s\"."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Usuniêto komentarz z zaznaczonych plików."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Zaznaczonym plikom ustawiono kompozytora na \"%s\"."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Usuniêto kompozytora z zaznaczonych plików."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono artystê na \"%s\"."
 
 # TODO
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Usuniêto artystê z zaznaczonych plików."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Zaznaczonym plikom ustawiono prawa autorskie na \"%s\"."
 
 # TODO
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Usuniêto prawa autorskie z zaznaczonych plików."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Zaznaczonym plikom ustawiono URL na \"%s\"."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Usuniêto URL z zaznaczonych plików."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Zaznaczonym plikom ustawiono koder na \"%s\"."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Usuniêto imiê koduj±cego z zaznaczonych plików."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Ustawiono obrazy w zaznaczonych plikach."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Usuniêto obrazy zaznaczonym plikom."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Wybierz tryb i maskê, po czym ponownie wybierz tê komendê"
 
 # TODO
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Wszystkie tagi zosta³y zeskanowane"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Wszystkie tagi zosta³y usuniête"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Szukaj pliku..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Wszystkie pliki zosta³y zapisane..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Pliki zosta³y czê¶ciowo skasowane..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Wszystkie pliki zosta³y skasowane..."
 
 # TODO
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2160,16 +2204,16 @@ msgstr ""
 "Czy chcesz zapisaæ taga pliku\n"
 "\"%s\" ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Zapisywanie taga..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Zmieñ nazwê pliku i katalogu..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2183,11 +2227,11 @@ msgstr ""
 "\"%s\" ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Zmieñ nazwê katalogu..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2201,11 +2245,11 @@ msgstr ""
 "\"%s\" ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Zmiana nazwy pliku..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2218,17 +2262,17 @@ msgstr ""
 "na \n"
 "\"%s\" ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisano tag \"%s\""
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Tag(i) zapisane"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2237,21 +2281,21 @@ msgstr ""
 "Nie mogê zapisaæ taga w pliku \"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Nie mogê zapisaæ taga w pliku \"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Zmiana nazwy pliku \"%s\""
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2264,7 +2308,7 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2273,11 +2317,11 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Plik(i) którym nie zmieniono nazwy..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2290,7 +2334,7 @@ msgstr ""
 "Plik o podanej nazwie ju¿ istnieje:\n"
 "\"%s\""
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2299,7 +2343,7 @@ msgstr ""
 "Plik o podanej nazwie ju¿ istnieje:\n"
 "\"%s\""
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2310,7 +2354,7 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2319,16 +2363,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Zmieniono nazwê pliku \"%s\" na \"%s\""
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Plik(i) którym zmieniono nazwê..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2339,7 +2383,7 @@ msgstr ""
 "\"%s\"\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2348,17 +2392,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Przeniesiono plik \"%s\" do \"%s\""
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Przeniesiono plik(i)..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2371,7 +2415,7 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2380,11 +2424,11 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Plik(i) nie zosta³y przeniesione..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2393,16 +2437,16 @@ msgstr ""
 "Czy na pewno chcesz usun±æ plik\n"
 "\"%s\" ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Usuniêcie pliku..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Usuniêto plik \"%s\""
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2414,110 +2458,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Trwa wyszukiwanie..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Plik: \"%s\""
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Znaleziono %d plik(ów) w tym katalogu i jego podkatalogach."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Znaleziono %d plik(ów) w tym katalogu."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u plik(ów)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nie znaleziono ¿adnego pliku w tym katalogu i jego podkatalogach!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Nie znaleziono ¿adnego pliku w tym katalogu!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  ZATRZYMAJ wyszukiwanie...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Wybierz katalog do przegl±dania!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr ""
 "Warto¶æ z tego pola zostanie wstawiona do pozosta³ych zaznaczonych plików"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Zamiana \"_\" i \"%20\" na spacje"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Zamiana \" \" na \"_\""
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Wszystko du¿± liter±"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Wszystko ma³± liter±"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Du¿a pierwsza litera"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Du¿a pierwsza litera ka¿dego s³owa"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Usuñ spacje"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Wstawia spacje przed du¿± liter±"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Usuwa powtarzaj±ce siê spacje lub podkre¶lenia"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Nienormalne wyj¶cie! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Otrzymano sygna³ %s (%d)"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2527,12 +2570,12 @@ msgstr ""
 "b³êdzie z stosem wywo³añ funkcji z gdb (\"gdb easytag core\" potem \"bt\") z "
 "informacj± do easytag at gmail.com (w jêzyku angielskim)"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Nieznany sygna³"
 
 # fixme
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2565,11 +2608,11 @@ msgstr ""
 "¶cie¿ka/do/plików          Wczytanie obecnego katalogu.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normalne wyj¶cie."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2577,82 +2620,82 @@ msgstr ""
 "Niektóre pliki zosta³y zmodyfikowane, lecz nie s± zapisane.\n"
 "Czy chcesz je zapisaæ przed zakoñczeniem programu?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Czy na pewno chcesz wyj¶æ z programu? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "Tag ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Tag Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "Tag FLAC Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "Tag APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "Tag MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Tag Wavpack"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "Plik MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "Plik MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Plik Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Plik Speex"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "Plik FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "Plik MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Plik Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "Plik MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Plik Wavpack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Obrazy (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2660,14 +2703,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2678,11 +2721,11 @@ msgstr ""
 "na systemowe kodowanie nazw plików\n"
 "(Spróbuj zmieniæ warto¶æ zmiennej systemowej G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "T³umaczenie nazw plików"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Nazwa pliku \"%s\" przekracza liczbê znaków %d i bêdzie obciêta!\n"
@@ -2706,55 +2749,55 @@ msgstr "Koder:"
 msgid "Channels:"
 msgstr "Kana³y:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "B£¡D podczas otwierania pliku: \"%s\" jako FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr "Nieprawid³owy blok obrazka: \"%s\""
 
 # TODO
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "B£¡D: Nie uda³o siê zapisaæ komentarzy do pliku \"%s\" (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Zapisano tag pliku \"%s\""
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Usuniêto tag z pliku \"%s\""
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "B³±d podczas usuwania taga ID3v1 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "B³±d podczas usuwania taga ID3v2 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "B³±d podczas uaktualniania taga ID3v2 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2779,78 +2822,78 @@ msgstr ""
 "\n"
 "Plik : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "B³±d podczas uaktualniania taga ID3v1 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Uaktualniono tag w pliku \"%s\""
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Nie odnotowano b³êdów"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Brak dostêpnej pamiêci"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Brak danych do przetwarzania"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Niepoprawnie sformatowane dane"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Brak bufora do zapisu"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Bufor jest za ma³y"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Nieprawid³owy identyfikator ramki"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "¯±dane pole nie zosta³o znalezione"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Nieznany typ pola"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Plik ju¿ posiada do³±czony tag"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Nieprawid³owa wersja taga"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Brak plików do przetwarzania"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Próba zapisania do pliku tylko do odczytu"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "B³±d podczas kompresji/dekompresji"
 
 # mój ulubiony ;-)
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Nieznany komunikat o b³êdzie!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2859,7 +2902,7 @@ msgstr ""
 "Uszkodzony plik \"%s\" spowoduje\n"
 "b³±d w id3lib, wiêc nie bêdzie on przetwarzany przez program."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Uszkodzony plik..."
 
@@ -2867,74 +2910,74 @@ msgstr "Uszkodzony plik..."
 msgid "Log"
 msgstr "Dziennik"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Wybierz plik..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Wybierz katalog..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Ostrze¿enie..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Brak zdefiniowanego odtwarzacza audio!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Nie mo¿na uruchomiæ %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Utworzenie listy odtwarzania"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Nazwa listy odtwarzania M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Nazwa katalogu"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Edytuj maski"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Opcje listy odtwarzania"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Do³±cz tylko zaznaczone pliki"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2942,30 +2985,30 @@ msgstr ""
 "Je¶li aktywowane, tylko zaznaczone pliki bêd± zapisywanie do playlisty. W "
 "przeciwnym przypadku, wszystkie pliki bêd± zapisane."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "U¿ycie bezwzglêdnych ¶cie¿ek do plików"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "U¿ycie wzglêdnych ¶cie¿ek do plików"
 
 # fixme
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Utworzenie listy odtwarzania w katalogu nadrzêdnym"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Utworzenie listy odtwarzania w katalogu nadrzêdnym (o jeden wy¿ej)."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "U¿ycie separatora katalogu DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2973,24 +3016,24 @@ msgstr ""
 "opcja zastêpuje separator katalogu UNIKSA \"/\" na znak separatora DOSa \"\\"
 "\"."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Zawarto¶æ listy odtwarzania"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Tylko listy plików"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Nazwy pliku jako dodatkowa informacja"
 
 # TODO poprawic to jakos w programie (zbyt d³ugie to jest)
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Dodatkowa informacja z maski:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2999,12 +3042,12 @@ msgstr ""
 "Lista odtwarzania \"%s\" ju¿ istnieje!\n"
 "Nadpisaæ?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Zapis listy odtwarzania..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -3013,24 +3056,24 @@ msgstr ""
 "Nie mo¿na zapisaæ listy odtwarzania \"%s\"!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapisano listê odtwarzania \"%s\""
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Koder"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Wyszukiwanie pliku"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3038,86 +3081,86 @@ msgstr ""
 "wy¶wietliæ wszystkie pliki."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "W :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "nazwie pliku"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "znaczniku"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Rozró¿nianie wielko¶ci liter"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Znaleziono: %d plik(ów)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Wczytanie nazw plików z pliku TXT"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Plik :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Wczytaj "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "Zawarto¶æ pliku TXT"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "Wstawia pust± liniê przed wybran± lini±"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "Usuñ wybran± liniê"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Usuñ wszystkie puste linie"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "Przesuñ do góry wybran± liniê"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "Przesuñ w dó³ wybran± liniê"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Od¶wie¿"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "Lista plików"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "Wybrana linia:"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3125,19 +3168,19 @@ msgstr ""
 "Po wczytaniu nazw plików zostanie uruchomiony aktualnie wybrany skaner (okno "
 "skanera musi byæ otwarte)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Wstaw pusty wiersz"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Usuñ t± liniê"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "Przesuñ t± liniê do góry"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "Przesuñ t± liniê w dó³"
 
@@ -3223,12 +3266,12 @@ msgstr ""
 "(plik: \"%s\")."
 
 # TODO
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "B£¡D: Nie uda³o siê otworzyæ pliku: \"%s\" jako Vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Ostrze¿enie: Plik Ogg Vorbis \"%s\" zawiera tag ID3v2."
@@ -3829,7 +3872,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Wymu¶ u¿ywanie systemowego kodowania znaków i w³±cz t³umaczenie znaków"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3846,7 +3889,7 @@ msgid ""
 msgstr ""
 "Wymu¶ u¿ywanie systemowego kodowania znaków i odrzuæ nie pasuj±ce znaki "
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -4004,22 +4047,33 @@ msgstr "U
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Ustaw kompresjê tagów ID3v2"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Zestawów znaków dla zapisu tagów ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "Tagi ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Zapisywanie tagów ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -4028,11 +4082,11 @@ msgstr ""
 "MP3. W przeciwnym wypadku zostanie usuniêty."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Wersja:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4044,34 +4098,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Zestaw znaków:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Metoda kodowania Unikodu"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Zestaw znaków u¿ywany do zapisywania tagów w pliku."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Dodatkowe ustawienia dla iconv():"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Nie"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
@@ -4081,25 +4135,25 @@ msgstr ""
 "docelowym kodowaniu, zostanie on zast±piony podobnie wygl±daj±cym znakiem "
 "(np. \"³\" zostanie zast±pione przez \"l\")."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "Tagi ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Zapisywanie tagów ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4107,28 +4161,28 @@ msgstr ""
 "Je¶li aktywne, tag ID3v1 bêdzie dodany lub uaktualniony na koñcu pliku MP3. "
 "W przeciwnym wypadku zostanie usuniêty."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Zestaw znaków u¿ywany do zapisywania tagów ID3v1 w pliku."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Zestawów znaków dla odczytu tagów ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Niestandardowy:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4149,32 +4203,32 @@ msgstr ""
 "znaków Windows-1251 aby odczytaæ tagi wpisane pod systemem Windows. Je¶li "
 "tagi zosta³y zapisane pod Uniksem, nale¿y wybraæ \"KOI8-R\"."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Zestaw znaków u¿ywany do czytania danych znaczników w pliku."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Skaner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Wype³nij tagi - konwersja znaków"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Zmieñ znaki podkre¶lenia \"_\" i ci±gi \"%20\" na spacje \" \""
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Zmieñ spacje \" \" na podkre¶lenia \"_\""
 
 # TODO
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4183,12 +4237,12 @@ msgstr ""
 "skanera dla tagów."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Zmieñ nazwê pliku - konwersja znaków"
 
 # TODO
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4197,17 +4251,17 @@ msgstr ""
 "skanera dla nazw plików."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Skaner pól - konwersja znaków"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Nie zmieniaj pierwszych liter s³ów kluczowych na du¿e."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4219,41 +4273,41 @@ msgstr ""
 "zamiast \"Text In An Entry\" otrzymasz \"Text in an Entry\")."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Okno Skanera"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Otwórz okno skanera podczas uruchamiania"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "Automatycznie otwieranie okno skanera podczas uruchamiania EasyTAG."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Okno skanera zawsze na wierzchu"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr "Okno zawieraj±ce maskê pozostaje zawsze ponad oknem g³ównym."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Pola"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Nadpisywanie pól podczas przetwarzania taga"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4261,11 +4315,11 @@ msgstr ""
 "Skaner zamieni stary tekst nowym w polach, które ju¿ zawieraj± jaki¶ tekst. "
 "Je¶li nieaktywne, tylko puste pola tagu zostan± wype³nione."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Ustaw ten tekst jako domy¶lny komentarz :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4274,11 +4328,11 @@ msgstr ""
 "podczas u¿ywania skanera \"Wype³nij znacznik\"."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "Ustaw sumê CRC32 pliku jako domy¶lny komentarz (tylko ID3)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4289,42 +4343,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "Baza danych CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Ustawienia serwera dla automatycznego wyszukiwania"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Nazwa :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "¦cie¿ka CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Ustawienia serwera dla rêcznego wyszukiwania"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Lokalna baza danych CD"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "¦cie¿ka :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4337,52 +4391,52 @@ msgstr ""
 "\"soundtrack\" oraz \"misc\"."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Ustawienia po¶rednika (proxy)"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Korzystanie z po¶rednika"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Uaktywnia ustawienia serwera po¶rednicz±cego."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Nazwa komputera :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Nazwa serwera po¶rednicz±cego."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Port serwera po¶rednicz±cego."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Nazwa u¿ytkownika :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Nazwa u¿ytkownika dla serwera po¶rednicz±cego."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Has³o u¿ytkownika :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Has³o dla serwera po¶rednicz±cego."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Lista ¶cie¿ek"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4390,7 +4444,7 @@ msgstr ""
 "Zaznacz odpowiedni plik audio (odno¶nie pozycji albo DLM, je¶li aktywowane "
 "poni¿ej)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4399,7 +4453,7 @@ msgstr ""
 "odpowiedni plik audio zostanie zaznaczony na g³ównej li¶cie."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4410,15 +4464,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Potwierdzenia"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Potwierd¼ wyj¶cie z programu"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4426,57 +4480,61 @@ msgstr ""
 "Je¶li aktywne, wy¶wietla okno dialogowe prosz±ce o potwierdzenie przed "
 "wyj¶ciem z programu."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Potwierd¼ zapisanie tagów pliku"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Potwierd¼ zmianê nazwy pliku"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Potwierd¼ kasowanie pliku"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Potwierd¼ zapisanie listy odtwarzania"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Zastosuj zmiany (lecz nie zapisuj) i zamknij to okno"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Zamknij to okno bez zapisywania zmian"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Zapisz zmiany i zamknij to okno"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Przyk³ad: %.*d_-_Nazwa_¶cie¿ki_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Zastosowano zmiany"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Konfiguracja zapisana"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Konfiguracja nie zmieniona"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4487,37 +4545,37 @@ msgstr ""
 "\"%s\"\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "To nie jest katalog"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Nie mo¿na znale¼æ programu \"%s\"!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Wype³nij znacznik"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Zmieñ nazwê pliku"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Przetwarzaj pola"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Znacznik pomy¶lnie zeskanowany..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Znacznik pomy¶lnie zeskanowany (%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4525,22 +4583,22 @@ msgstr ""
 "Skaner tagów: dziwne..., rozszerzenie \"%s\" nie zosta³o znalezione w pliku "
 "\"%s\"!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "B³±d skanowania: Nie mo¿na znale¼æ separatora \"%s\" wewn±trz \"%s\""
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 "Nie mogê przekonwertowaæ nazwy pliku \"%s\" na systemowe kodowanie znaków."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Nowa nazwa pliku pomy¶lnie zeskanowana..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nowa nazwa pliku pomy¶lnie zeskanowana...(%s)"
@@ -4548,42 +4606,42 @@ msgstr "Nowa nazwa pliku pomy
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Skanowanie znaczników i nazw plików"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Skaner:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Wybierz rodzaj skanera, który ma zostaæ u¿yty"
 
 # TODO
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Wy¶wietlenie okna skanera / skanowanie zaznaczonych plików"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Opcje skanera"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Wy¶wietl / Ukryj edytor masek"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Wy¶wietl / Ukryj legendê"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Zamyka bie¿±ce okno"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4593,15 +4651,15 @@ msgstr ""
 
 # fixme
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Podgl±d zmiany taga..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Dodaj do maski przedrostek aktualnej ¶cie¿ki"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4615,15 +4673,15 @@ msgstr ""
 "wzglêdna."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Podgl±d zmiany nazwy pliku..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Wybierz pola:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4632,126 +4690,136 @@ msgstr ""
 "przetworzone. Wybierz te, które maj± byæ zmienione."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "N"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Przetwarzanie pola nazwa pliku"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Przetwarzanie pola tytu³"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Przetwarzanie pola artysta"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Przetwarzanie pola artysta"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Przetwarzanie pola album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "R"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Przetwarzanie pola rodzaj"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Km"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Przetwarzanie pola komentarz"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Kp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Przetwarzanie pola kompozytor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Przetwarzanie pola oryginalny artysta"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Przetwarzanie pola prawa autorskie"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Przetwarzanie pola URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Przetwarzanie pola nazwa encodera"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Odwrócenie zaznaczenia"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Wybierz/Odznacz wszystko."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Zamieñ \"_\" i \"%20\" na \" \""
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Zamieñ:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "na: "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4759,7 +4827,7 @@ msgstr ""
 "Znak podkre¶lenia oraz ci±g \"%20\" jest zamieniany przez jedn± spacjê. "
 "Przyk³ad, przed: \"Tekst%20W%20Jakim¶_Polu\", po: \"Tekst W Jakim¶ Polu\"."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4767,16 +4835,16 @@ msgstr ""
 "Znak spacji jest zamieniany na jeden znak podkre¶lenia. Przyk³ad, przed: "
 "\"Tekst W Jakim¶ Polu\", po: \"Tekst_W_Jakim¶_Polu\"."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr "Zamieñ podany tekst na inny. Wyszukiwanie rozró¿nia wielko¶æ liter."
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr "Wykryj liczby rzymskie"
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4784,7 +4852,7 @@ msgstr ""
 "Zamienia wszystkie s³owa we wszystkich polach na wielkie litery. Przyk³ad, "
 "przed: \"Tekst W JAKIM¦ polu\", po: \"TEKST W JAKIM¦ POLU\"."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4792,7 +4860,7 @@ msgstr ""
 "Zamienia wszystkie s³owa we wszystkich polach na ma³e litery. Przyk³ad, "
 "przed: \"TEKST W jakim¶ polu\", po: \"tekst w jakim¶ polu\"."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4801,7 +4869,7 @@ msgstr ""
 "literê. Przyk³ad, przed: \"Tekst W Jakim¶ POLU\", po: \"Tekst w jakim¶ polu"
 "\"."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4810,7 +4878,7 @@ msgstr ""
 "literê. Przyk³ad, przed: \"Tekst w jakim¶ POLU\", po: \"Tekst W Jakim¶ Polu"
 "\"."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4818,15 +4886,15 @@ msgstr ""
 "Wymusza zamianiê liczb rzymskich na du¿e litery. Przyk³ad, przed: \"ix. "
 "tekst w jakim¶ polu\", po: \"IX. Tekst W Jakim¶ Polu\"."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Wstawia spacjê przed wielka liter±"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Usuwa duplikaty spacji lub podkre¶leñ"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4834,7 +4902,7 @@ msgstr ""
 "Wszystkie spacje pomiêdzy s³owami s± usuwane. Przyk³ad, przed: \"Tekst W "
 "Jakim¶ Polu\", po: \"TekstWJakim¶Polu\"."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4842,7 +4910,7 @@ msgstr ""
 "Spacja jest wstawiana przed ka¿d± wielk± liter±. Przyk³ad, przed: "
 "\"TekstWJakim¶Polu\", po: \"Tekst W Jakim¶ Polu\"."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4853,183 +4921,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a: artysta"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a: artysta"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b: album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c: komentarz"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompozytor"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r: prawa autorskie    "
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: numer dysku"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: skompresowany przez    "
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g: gatunek"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: ignorowane"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l: liczba ¶cie¿ek"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: oryg. artysta"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n: ¶cie¿ka"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t: tytu³"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y: rok"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Edytor masek"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Utwórz now± maskê"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Przesuñ maskê do góry"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Przesuñ maskê w dó³"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Zduplikuj maskê"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Dodaj domy¶ln± maskê"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Usuñ maskê"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Zapisz maski"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nowa_maska"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Kopiowanie: Nie wybrano wiersza!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Usuwanie: Nie wybrano wiersza!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Przewijanie w górê: Nie wybrano wiersza!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Przewijanie w dó³: Nie wybrano wiersza!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "B£¡D: Nie mo¿na zapisaæ pliku konfiguracji: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nie mo¿na otworzyæ pliku konfiguracji \"%s\" (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Wczytywanie domy¶lnej konfiguracji..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nie mo¿na otworzyæ lub utworzyæ pliku \"%s\" (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "B£¡D: Nie mo¿na zapisaæ listy do pliku: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Wczytywanie domy¶lnych masek \"Wype³nij tagi\"..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Wczytywanie domy¶lnych masek \"Zmieñ nazwê pliku\"..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Wczytywanie domy¶lnych masek \"Zmieñ nazwê katalogu\"..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "B£¡D: Zmienna ¶rodowiskowa HOME nie jest zdefiniowana!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "B£¡D: Nie mo¿na utworzyæ katalogu \"%s\" (%s)!"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index a2667ff..bb012a6 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7780e39..8583fe0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-12-21 14:54-0200\n"
 "Last-Translator: doutor.zero <doutor.zero at gmail.com>\n"
 "Language-Team: Português do Brasil <kde-i18n-pt_br at kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,6 +33,7 @@ msgstr ""
 "e prática interface em GTK+ facilita a edição de etiquetas no GNU/Linux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Tradução alemã)"
 
@@ -111,137 +113,137 @@ msgstr "(Tradução hebraica)"
 msgid "(Serbian translation)"
 msgstr "(Tradução sérvia)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "Nome da Extensão"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "Status"
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Comentário"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Sobre..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Sobre"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilado: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Página na Web: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Descrição:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "Extensões"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "Suporte a arquivos MP3"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "desabilitado"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "Suporte a gravação de etiquetas ID3v2.3"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "disponível"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Suporte a arquivos Ogg Vorbis"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Suporte a arquivos Speex"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "Suporte a arquivos FLAC"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "Suporte a arquivos MP4/AAC"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "Suporte a arquivos WavPack"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Agradecimentos"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Traduções:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Principalmente:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Modificações"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Não foi possível abrir o arquivo '%s' (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ERRO ao abrir o arquivo: '%s' (%s)."
@@ -249,484 +251,494 @@ msgstr "ERRO ao abrir o arquivo: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Organizar a lista por etiqueta"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Organizar a lista pela propriedade"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Ascendente pelo nome do arquivo"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Descendente pelo nome do arquivo"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Ascendente pela data de criação "
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Descendente pela data de criação"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Ascendente pelo número da faixa"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Descendente pelo número da faixa"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Ascendente pelo título"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Descendente pelo título"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Ascendente pelo artista"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Descendente pelo artista"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Ascendente pelo artista"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Descendente pelo artista"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Ascendente pelo álbum"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Descendente pelo álbum"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Ascendente pelo ano"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Descendente pelo ano"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Ascendente pelo gênero"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Descendente pelo gênero"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Ascendente pelo comentário"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Descendente pelo comentário"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Ascendente pelo compositor"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Descendente pelo compositor"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Ascendente pelo artista original"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Descendente pelo artista original"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Ascendente pelo copyright"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Descendente pelo copyright"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Ascendente pela URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Descendente pela URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Ascendente pelo nome do codificador"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Descendente pelo nome do codificador"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Ascendente pelo tipo do arquivo"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Descendente pelo tipo do arquivo"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Ascendente pelo tamanho do arquivo"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Descendente pelo tamanho do arquivo"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Ascendente pela duração"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Descendente pela duração"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Ascendente pela taxa de bits"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Descendente pela taxa de bits"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Ascendente pela taxa de amostragem"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Descendente pelo taxa de amostragem"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Abrir Arquivo(s) com..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Selecionar Todos os Arquivos"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Deselecionar Todos os Arquivos"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Inverter a Seleção dos Arquivos"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Apagar Arquivo(s)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Primeiro Arquivo"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Primeiro Arquivo"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Arquivo _Anterior"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Arquivo Anterior"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "P_róximo Arquivo"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Próximo Arquivo"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "Úl_timo Arquivo"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Último Arquivo"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "V_erificar Arquivo(s)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Verificar Arquivo(s)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Remover Etiqueta(s)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Remover Etiqueta(s)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Desfazer a Última Modificação no(s) Arquivo(s)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Desfazer a Última Modificação no(s) Arquivo(s)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "Re_fazer a Última Modificação no(s) Arquivo(s)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Refazer a Última Modificação no(s) Arquivo(s)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Salvar Arquivo(s)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Salvar Arquivo(s)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "_Forçar o Salvamento do Arquivo(s)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Forçar o Salvamento do Arquivo(s)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Desfazer as Útlimas Modificações"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Refazer as Útlimas Modificações"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "Sa_ir"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Sair"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Navegador"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Ir para o Diretório Home"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Ir para o Diretório Home"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Ir para o Diretório Padrão"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Ir para o Diretório Home"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Ir para o Diretório Home"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Ir para o Diretório Home"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Ir para o Diretório Padrão"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Ir para o Diretório Padrão"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Definir o _Caminho Atual como Padrão"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Definir o Caminho Atual como Padrão"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Visão em Árvore | Visão Artista-Álbum"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Renomear Diretório..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Recarregar Diretório"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Navegar no Diretório com..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Fechar Árvore"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Atualizar Árvore"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "V_erificador"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Preencher Etiqueta(s)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Preencher Etiqueta(s)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Renomear Arquivo(s) e Diretório..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Renomear Arquivo(s) e Diretório..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "Pr_ocessar Campo(s)..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Processar Campo(s)..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Diversos"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Procurar _Arquivo(s)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Procurar Arquivo(s) ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Busca no Banco de Dados de CDs..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "Procurar no CDDB..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Carregar Nomes dos Arquivos de um TXT..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Gravar Lista de Músicas..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Executar Reprodutor de Áudio"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Configurações"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Preferências..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Preferências..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Sobre"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Parar a ação atual"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Operação em Arquivos"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Procurar no CDDB pelo Arquivo(s)..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Log Limpo"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Navegar nos _Subdiretórios"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Mostrar Diretórios Ocultos"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Mostrar o navegador em árvore / Exibir por Artista e Álbum"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Não foi possível unir a IU, o erro foi: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Pronto para começar..."
 
@@ -735,7 +747,7 @@ msgid "New default path for files selected"
 msgstr "Selecionado novo caminho padrão para arquivos"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Confirme..."
 
@@ -747,119 +759,124 @@ msgstr ""
 "Alguns arquivos modificados não foram salvos...\n"
 "Você quer salvá-los antes de mudar de diretório?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Todos os álbuns>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Erro: Procurando por %s, não pude encontrar o node %s na árvore."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Árvore"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Nome do Arquivo"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Título"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artista"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Álbum"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Ano"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Faixa"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Gênero"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Artista Orig."
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 msgid "Encoded By"
 msgstr "Codificado Por"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Álbuns"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Arquivos"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Ir para o diretório superior"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Escolha um diretório para navegar."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 msgid "Select a directory to browse."
 msgstr "Selecione um diretório para navegar."
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u arquivo(s)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artista & Álbum"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Renomear o diretório"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renomear o diretório '%s' para: "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Usar a máscara:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Se ativada, máscaras serão usadas para renomear o diretório."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -867,31 +884,31 @@ msgstr ""
 "Selecione ou digite na máscara usando códigos (veja a Legenda na Janela do "
 "Verificador) para renomear o diretório à partir dos campos das etiquetas."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Máscara de Verificação Inválida"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Pré-visualização da renomeação do diretório..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Erro..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Você deve digitar um nome para o diretório!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -926,7 +943,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -935,7 +952,7 @@ msgstr ""
 "Não foi possível renomear porque esse nome de diretório já existe!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -950,88 +967,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Diretório Renomeado"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Programa para executar:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Escolha o programa para executar. Ele receberá o diretório atual como "
 "parâmetro."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Abrir Arquivo com..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Escolha o programa para executar. Ele receberá o arquivo atual como "
 "parâmetro."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Você deve digitar o nome do programa!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "O programa '%s' não foi encontrado!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Não foi possível executar %s (erro %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Não foi possível separar outro processo!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando executado: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Categoria"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Nome da Faixa"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Tempo"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Procurar no Banco de Dados de CDs"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Busca Automática"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "Requisitar banco de dados de CD:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1039,16 +1056,16 @@ msgstr ""
 "Requisitar automaticamente o banco de dados CDDB usando os arquivos "
 "selecionados (a ordem é importante!) para gerar o CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Parar a busca..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Usar Cddb local"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1059,139 +1076,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Busca Manual"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Palavras:"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Digite as palavras para procurar (separadas por um espaço ou '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Buscar Em:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Todos os Campos"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Outro"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Todas as Categorias"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Clássico"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diversas"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Trilha Sonora"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "incluindo: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "filmes, shows"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "outras que não se enquadrem nas categorias acima"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Categorias "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Resultados:"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Procurar:"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Digite as palavras para buscar na lista abaixo"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Procurar Próximo"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Procurar Anterior"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Mostrar apenas linhas vermelhas (ou mostrar todas as linhas) na lista "
 "'Artista / Álbum'"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Deselecionar todas as linhas"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Inverter linhas selecionadas"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Selecionar todas as linhas"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1204,36 +1221,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Definir Em:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Todos"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Faixa #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Faixas"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Executar a verificação atual para cada arquivo"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Coincidir linhas com o algoritmo Levenshtein"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1248,93 +1265,97 @@ msgstr ""
 "correspondente, ou ao aplicar os resultados CDDB, ao invés de usar "
 "diretamente a ordem na lista."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Carrega as linhas selecionadas ou todas as linhas (se nenhuma linha estiver "
 "selecionada)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Pronto para procurar..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Álbum: '%s', artista: '%s', duração: '%s', ano: '%s', gênero: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Organizar pelo Número da Faixa"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Organizar pelo Nome da Faixa"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Determinando host '%s'..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Não foi possível determinar o host '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Não foi possível criar um novo socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Conectando ao host '%s', porta '%d'..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Não foi possível conectar ao host '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectado ao host '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Recebendo dados (%s)..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Erro ao ler a resposta do cddb (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Não foi possível criar o arquivo '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Não foi possível abrir o arquivo '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Enviando requisição..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Não foi possível enviar a requisição (%s)!"
@@ -1343,63 +1364,64 @@ msgstr "Não foi possível enviar a requisição (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Recebendo dados..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "O servidor retornou uma resposta incorreta!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "O servidor retornou uma resposta incorreta! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Desculpe, mas a busca na web não é possível no momento!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Encontrado(s) %d álbum(ns) iguais"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Recebendo dados da página %d (álbum %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Recebendo dados da página %d..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Mais resultados para carregar..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Nenhum arquivo selecionado!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 "Foram selecionados mais de 99 arquivos! Não foi possível enviar a requisição!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d arquivo(s) selecionado(s)!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Busca de CD local..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
@@ -1407,28 +1429,28 @@ msgstr ""
 "O caminho para o 'Banco de Dados de CDs Local' não foi definido!\n"
 "Preencha-o, na janela de preferências, antes de usar esta busca."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Enviando requisição (CddbId: %s, #faixas: %d, Duração do disco: %d)..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Encontrados %d álbuns iguais para o DiscID '%s'"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Não foi possível carregar o arquivo: '%s' (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Carregando lista das faixas do álbum..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1441,7 +1463,7 @@ msgstr ""
 "\n"
 "Deseja continuar?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Gravar Etiqueta do CDDB..."
 
@@ -1701,7 +1723,7 @@ msgstr "Parâmetro desconhecido ou caminho '%s'\n"
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Arquivo"
 
@@ -1715,11 +1737,11 @@ msgstr "Link de Arquivo Quebrado"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Camada ?"
 
@@ -1727,7 +1749,7 @@ msgstr "?, Camada ?"
 msgid "Bitrate:"
 msgstr "Taxa de Bits:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1735,17 +1757,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modo:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1762,7 +1784,7 @@ msgid "Time:"
 msgstr "Tempo:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -1791,34 +1813,45 @@ msgstr "Artista:"
 msgid "Tag selected files with this artist"
 msgstr "Etiquetar arquivos selecionados com esse artista"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artista:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Etiquetar arquivos selecionados com esse artista"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Álbum:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Etiquetar arquivos selecionados com esse nome do álbum"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Etiquetar arquivos selecionados com esse número do disco"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Ano:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Etiquetar arquivos selecionados com esse ano"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numerar os arquivos selecionados seqüencialmente. Começar com 01 em cada "
@@ -1826,11 +1859,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Faixa #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1838,287 +1871,296 @@ msgstr ""
 "Definir o número de arquivos, no mesmo diretório do arquivo exibido, para as "
 "faixas selecionadas."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiquetar os arquivos selecionados com esse número de faixa"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Gênero:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Etiquetar os arquivos selecionados com esse gênero"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Etiquetar os arquivos selecionados com esse comentário"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Etiquetar os arquivos selecionados com esse compositor"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Artista Orig.:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Etiquetar os arquivos selecionados com esse artista original"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Etiquetar os arquivos selecionados com esse copyright"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Etiquetar os arquivos selecionados com essa URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Etiquetar os arquivos selecionados com esse nome do codificador"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Imagens"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Imagens:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Você pode usar 'arrastar e soltar' para adicionar uma imagem."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Etiqueta os arquivos selecionados com essas imagens"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Adicionar imagens à etiqueta (também é possível 'arrastar e soltar')."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Remover as imagens selecionadas, ou todas as imagens."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salvar as imagens selecionadas no disco rígido."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Definir as propriedades dos arquivos selecionados."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Arquivos selecionados etiquetados com o título '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Remover o título dos arquivos selecionados."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Remover artista dos arquivos selecionados."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Arquivos selecionados etiquetados com o artista '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Remover artista dos arquivos selecionados."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Arquivos selecionados etiquetados com o álbum '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Nome do álbum removido dos arquivos selecionados."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Arquivos selecionados etiquetados com o número do disco '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Número do disco removido dos arquivos selecionados."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Arquivos selecionados etiquetados com o ano '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Ano removido dos arquivos selecionados."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Arquivos selecionados etiquetados com a faixa como 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Arquivos selecionados etiquetados com a faixa como 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Número da faixa removido dos arquivos selecionados."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Faixas selecionadas numeradas seqüencialmente."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Arquivos selecionados etiquetados com o gênero '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Gênero removido dos arquivos selecionados."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Arquivos selecionados etiquetados com o comentário '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Comentário removido dos arquivos selecionados."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Arquivos selecionados etiquetados com o compositor '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Compositor removido dos arquivos selecionados."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista original '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Artista original removido dos arquivos selecionados."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Arquivos selecionados etiquetados com o copyright '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Copyright removido dos arquivos selecionados."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Arquivos selecionados etiquetados com a URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "URL removida dos arquivos selecionados."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Arquivos selecionados etiquetados com o nome do codificador '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Nome do codificador removido dos arquivos selecionados."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Arquivos selecionados etiquetados com imagens."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Imagens removidas dos arquivos selecionados."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Seleciona Modo e Máscara, e refaz a mesma ação"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Todas as etiquetas foram verificadas"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Todas as etiquetas foram removidas"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Procurar Arquivo(s) ..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Todas os arquivos foram salvos..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Arquivos foram parcialmente apagados..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Todos os arquivos foram apagados..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2127,16 +2169,16 @@ msgstr ""
 "Deseja gravar a etiqueta no arquivo\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Gravar Etiqueta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Renomear Arquivo e Diretório..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2150,11 +2192,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Renomear Diretório..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2168,11 +2210,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Renomear Arquivo..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2185,17 +2227,17 @@ msgstr ""
 "para \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Gravando etiqueta em '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Etiqueta(s) gravada(s)"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2204,21 +2246,21 @@ msgstr ""
 "Não foi possível gravar a etiqueta no arquivo '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Não foi possível gravar a etiqueta no arquivo '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Renomeando o arquivo '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2231,7 +2273,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2240,11 +2282,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Arquivos não foram renomeados..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2257,7 +2299,7 @@ msgstr ""
 "porque o seguinte arquivo já existe:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2266,7 +2308,7 @@ msgstr ""
 "porque o seguinte arquivo já existe:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2277,7 +2319,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2286,16 +2328,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Arquivo '%s' renomeado para '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Arquivos renomeados..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2306,7 +2348,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2315,17 +2357,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Arquivo '%s' movido para '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Arquivo(s) movidos..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2338,7 +2380,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2347,11 +2389,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Arquivo(s) não foram movidos..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2360,16 +2402,16 @@ msgstr ""
 "Tem certeza que deseja apagar definitivamente o arquivo\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Apagar Arquivo..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Arquivo '%s' apagado"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2381,109 +2423,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Busca em progresso..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Arquivo: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Encontrado(s) %d arquivo(s) nesse diretório e subdiretórios."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Encontrado(s) %d arquivo(s) nesse diretório."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u arquivo(s)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nenhum arquivo encontrado nesse diretório e subdiretórios!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Nenhum arquivo encontrado nesse diretório!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Procurando..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  PARAR a busca...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Selecione um diretório para navegar!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Etiquetar arquivos selecionados com esse campo"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converter '_' e '%20' para espaços"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Converter ' ' para '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Todas maiúsculas"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Todas minúsculas"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Primeira letra maiúscula"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Primeira letra de cada palavra maiúscula"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Remover espaços"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Inserir espaço antes da letra maiúscula"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Remover espaços e underscores duplicados"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Saída anormal! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Recebido o sinal %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2493,11 +2534,11 @@ msgstr ""
 "bug com um backtrace do gdb ('gdb easytag core' então 'bt' e 'l') e "
 "informações para reproduzi-lo para easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Sinal desconhecido"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2530,11 +2571,11 @@ msgstr ""
 "caminho_para/arquivos    Usar um caminho absoluto para carregar,\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Saída normal."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2542,82 +2583,82 @@ msgstr ""
 "Alguns arquivos modificados não foram salvos...\n"
 "Você deseja salvá-los antes de fechar o programa?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Tem certeza que deseja fechar o programa? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "Etiqueta ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Etiqueta Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "Etiqueta FLAC"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "Etiqueta APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etiqueta MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Etiqueta Wavpack"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "Arquivo MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "Arquivo MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Arquivo Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Arquivo Speex"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "Arquivo FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "Arquivo MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Arquivo Monkey's"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "Arquivo MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Arquivo Wavpack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Imagens (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2625,14 +2666,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2643,11 +2684,11 @@ msgstr ""
 "em um nome de arquivo na codificação do sistema\n"
 "(Tente ajustar a variável de ambiente G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Tradução do nome do arquivo"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "O nome do arquivo '%s' excede %d caracteres e será truncado!\n"
@@ -2671,54 +2712,54 @@ msgstr "Codificador:"
 msgid "Channels:"
 msgstr "Canais:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "ERRO ao abrir o arquivo: '%s' como FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr "O bloco da imagem não é válido: '%s'"
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERRO: Falha ao gravar comentários no arquivo '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Gravada etiqueta de '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Removida etiqueta de '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Erro enquanto removia etiqueta ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Erro enquanto removia etiqueta ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Erro enquanto atualizava etiqueta ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2743,77 +2784,77 @@ msgstr ""
 "\n"
 "Arquivo: %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Erro enquanto atualizava etiqueta ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Etiqueta atualizada de '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Nenhum erro reportado"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Sem memória disponível"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Sem dados para analisar"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Dados formatados incorretamente"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Sem buffer para gravar para"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Buffer é muito pequeno"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "ID do quadro inválido"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Campo requerido não encontrado"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Tipo de campo desconhecido"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Etiqueta já está anexada ao arquivo"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Versão da etiqueta inválida"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Nenhum arquivo para analisar"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Tentando gravar para um arquivo somente-leitura"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Erro na compressão/descompressão"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Mensagem de erro desconhecida!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2822,7 +2863,7 @@ msgstr ""
 "Como o seguinte arquivo corrompido: '%s'\n"
 "iria causar um erro na id3lib, ele não será processado pelo programa."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Arquivo corrompido..."
 
@@ -2830,74 +2871,74 @@ msgstr "Arquivo corrompido..."
 msgid "Log"
 msgstr "Log"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Arquivo selecionado..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Diretório selecionado..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Atenção..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Nenhum reprodutor de áudio definido!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Não foi possível executar %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Gerar uma lista de músicas"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Nome da Lista de músicas M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Usar o nome do diretório"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Editar Máscaras"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Opções da Lista de músicas"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Incluir somente os arquivos selecionados"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2905,29 +2946,29 @@ msgstr ""
 "Se ativada, somente os arquivos selecionados serão gravados no arquivo de "
 "lista de músicas. Caso contrário, todos os arquivos serão gravados."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Usar o caminho absoluto para os arquivos na lista de músicas"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Usar o caminho relativo para os arquivos na lista de músicas"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Criar uma lista de músicas no diretório acima"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Se ativada, a lista de músicas será criada no diretório acima."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Usar separador de diretório DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2935,23 +2976,23 @@ msgstr ""
 "Essa opção substitui o separador de diretório UNIX '/' por um separador DOS "
 "'\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Conteúdo da Lista de músicas"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Gravar somente a lista dos arquivos"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Gravar informações usando o nome do arquivo"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Gravar informações usando:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2960,12 +3001,12 @@ msgstr ""
 "O arquivo de lista de músicas '%s' já existe!\n"
 "Sobrescrever?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Gravar Lista de músicas..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2974,24 +3015,24 @@ msgstr ""
 "Não foi possível gravar o arquivo de lista de músicas '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Gravando o arquivo de lista de músicas '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Codificador por"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Procurar um arquivo"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2999,86 +3040,86 @@ msgstr ""
 "exibir todos os arquivos."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "No:"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "Nome do Arquivo"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "Etiqueta"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Sensível à capitalização"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Encontrado: %d arquivo(s)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Carregar os nomes dos arquivos de um arquivo TXT"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Arquivo:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Carregar "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "Conteúdo do arquivo TXT"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "Inserir uma linha em branco antes da linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "Apagar a linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Apagar todas as linhas em branco"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "Mover para cima a linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "Mover para baixo a linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Recarregar"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "Lista dos arquivos"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "Linha selecionada:"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3087,19 +3128,19 @@ msgstr ""
 "selecionado atualmente será executado (a janela do verificador deverá estar "
 "aberta)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Inserir uma linha em branco"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Apagar essa linha"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "Mover essa linha para cima"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "Mover essa linha para baixo"
 
@@ -3183,12 +3224,12 @@ msgstr ""
 "Ogg Vorbis: Falta de lógica interna, indica um bug ou erro/corrupção de "
 "memória (arquivo: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERRO: Falha ao abrir o arquivo: '%s' como vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Atenção: O arquivo Ogg Vorbis '%s' contém uma etiqueta ID3v2."
@@ -3788,8 +3829,8 @@ msgid ""
 msgstr ""
 "Com essa opção, será tentada uma conversão para a codificação associada à "
 "seu local (por exemplo: ISO-8859-1 para 'fr', KOI8-R para 'ru', ISO-8859-2 "
-"para 'ro'). Se isso falhar, será usada a codificação de caracteres ISO-8859-"
-"1."
+"para 'ro'). Se isso falhar, será usada a codificação de caracteres "
+"ISO-8859-1."
 
 #: src/prefs.c:551
 msgid ""
@@ -3798,7 +3839,7 @@ msgstr ""
 "Forçar o uso da codificação de caracteres do sistema e ativar a "
 "transliteração"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3816,7 +3857,7 @@ msgstr ""
 "Forçar o uso da codificação de caracteres do sistema e descartar "
 "silenciosamente alguns caracteres"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3974,22 +4015,33 @@ msgstr "Usar Compressão"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Aplicar a Compressão nas etiquetas ID3v2 "
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Conjunto de Caracteres para a gravação das etiquetas ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "Etiquetas ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Gravar etiqueta ID3v2.x"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3998,11 +4050,11 @@ msgstr ""
 "arquivos MP3. Caso contrário a etiqueta será removida."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Versão:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4014,35 +4066,35 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Conjunto de caracteres:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Tipo do unicode a ser usado"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 "Conjunto de caracteres usado para gravar os dados da etiqueta no arquivo"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Configurações adicionais para o iconv():"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Não"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
@@ -4052,25 +4104,25 @@ msgstr ""
 "de caracteres alvo, ele não será alterado. Mas saiba que uma mensagem de "
 "erro será exibida, para informações."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLITERAR"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORAR"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "Etiquetas ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Gravar etiqueta ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4078,30 +4130,30 @@ msgstr ""
 "Se ativada, uma etiqueta ID3v1.x será adicionada ou atualizada no fim do "
 "arquivo MP3. Caso contrário a etiqueta será removida."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 "Conjunto de caracteres a ser usado para gravar os dados da etiqueta ID3v1 no "
 "arquivo."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Conjunto de Caracteres para a leitura das etiquetas ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Fora do padrão:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4124,31 +4176,31 @@ msgstr ""
 "caracteres 'Windows-1251' para carregar etiquetas gravadas no Windows. E "
 "'KOI8-R' para carregar etiquetas gravadas em sistemas Unix."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Conjunto de caracteres usado para ler os dados da etiqueta no arquivo."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Verificador"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Verificador de Preenchimento da Etiqueta - Conversão de Caracteres"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Converter caractere underscore '_' e a seqüencia '%20' para espaço ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converter espaço ' ' para underscore '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4157,11 +4209,11 @@ msgstr ""
 "etiquetas."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Verificador de Renomeamento de Arquivos - Conversão de Caracteres"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4170,19 +4222,19 @@ msgstr ""
 "nome dos arquivos."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Verificador de Processamento dos Campos - Conversão de Caracteres"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Não converter em maiúsculas a primeira letra de palavras para algumas "
 "preposições e artigos."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4195,15 +4247,15 @@ msgstr ""
 "de 'Texto Em Uma Entrada')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Janela do Verificador"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Abrir a Janela do Verificador na inicialização"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4211,11 +4263,11 @@ msgstr ""
 "Ative essa opção para abrir automaticamente a janela do verificador quando o "
 "EasyTAG iniciar."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Janela do verificador sempre no topo"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4224,16 +4276,16 @@ msgstr ""
 "principal."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Campos"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Sobrescrever campos ao verificar as etiquetas"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4242,11 +4294,11 @@ msgstr ""
 "novo. Se desativado, somente os campos em branco da etiqueta serão "
 "preenchidos."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Definir esse texto como o comentário padrão:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4255,13 +4307,13 @@ msgstr ""
 "comentário ao usar o 'Verificador de Preenchimento'."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Usar CRC32 como o comentário padrão (somente para arquivos com etiquetas "
 "ID3)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4272,42 +4324,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "Banco de Dados de CDs"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Configurações do Servidor para Busca Automática"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Nome:"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "Caminho CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Configurações do Servidor para Busca Manual"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Banco de Dados de CDs Local"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Caminho:"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4320,52 +4372,52 @@ msgstr ""
 "'soundtrack' e 'misc'.\""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Opções Proxy"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Usar um proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Definir as opções ativas do servidor proxy."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Nome do Host:"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Nome do servidor proxy."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Porta do servidor proxy."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Nome do Usuário:"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Nome do usuário do servidor proxy."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Senha do Usuário:"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Senha do usuário para o servidor proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Lista do Nome das Faixas"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4373,7 +4425,7 @@ msgstr ""
 "Selecionar o arquivo de áudio correspondente (de acordo com a posição ou com "
 "o DLM, se ativado abaixo)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4382,7 +4434,7 @@ msgstr ""
 "correspondente na lista principal também será selecionado."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4393,15 +4445,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Confirmar ao sair do programa"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4409,57 +4461,61 @@ msgstr ""
 "Se ativada, será aberta uma caixa de diálogo pedindo confirmação antes de "
 "fechar o programa."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Confirmar a gravação da etiqueta no arquivo"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Confirmar a renomeação do arquivo"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Confirmar a remoção do arquivo"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Confirmar a gravação da lista de músicas"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Aplicar modificações (mas não salvar) e fechar essa janela"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Fechar essa janela sem salvar"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Salvar modificações e fechar essa janela"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exemplo: %.*d_-_Nome_da_faixa_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Modificações aplicadas"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Configuração salva"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Configuração inalterada"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4470,37 +4526,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Não é um diretório"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "O reprodutor de áudio '%s' não foi encontrado!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Preencher Etiqueta"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Renomear Arquivo e Diretório"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Processar Campos"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Etiqueta verificada com sucesso..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Etiqueta verificada com sucesso...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4508,24 +4564,24 @@ msgstr ""
 "Verificador de etiqueta: estranho..., a extensão '%s' não foi encontrada no "
 "nome de arquivo '%s'!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
 "Erro de Verificação: não foi possível achar o separador '%s' dentro de '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 "Não foi possível converter o nome do arquivo '%s' para um nome de arquivo na "
 "codificação do sistema."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Novo nome do arquivo verificado com sucesso..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Novo nome do arquivo verificado com sucesso...(%s)"
@@ -4533,41 +4589,41 @@ msgstr "Novo nome do arquivo verificado com sucesso...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Verificação da Etiqueta e do Nome do Arquivo"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Verificador:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Selecionar o tipo do verificador"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Abrir janela do verificador / Verificar arquivos selecionados"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Opções do Verificador"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Mostrar / Esconder o Editor de Máscaras"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Mostrar / Esconder Legendas"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Fechar essa janela"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4576,15 +4632,15 @@ msgstr ""
 "o nome do arquivo e o caminho. Usado para preencher campos das etiquetas."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Pré-visualização do preenchimento da etiqueta..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Prefixo da máscara no caminho atual"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4597,15 +4653,15 @@ msgstr ""
 "contrário é relativo ao caminho anterior."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Pré-visualização da renomeação do arquivo..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Campos selecionados:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4614,126 +4670,136 @@ msgstr ""
 "Selecione os que lhe interessam."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "A"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Processar o campo do nome do arquivo"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Processar o campo do título"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Processar o campo do artista"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Processar o campo do artista"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Processar o campo do álbum"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Processar o campo do gênero"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Processar o campo do comentário"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Processar o campo do compositor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "A"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Processar o campo do artista original"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Processar o campo de copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Processar o campo da URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "C"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Processar o campo do nome do codificador"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Inverter Seleção"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Selecionar/Deselecionar Todos."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Converter '_' e '%20' para ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Converter:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "para: "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4742,7 +4808,7 @@ msgstr ""
 "Por exemplo, antes: 'Texto%20Em%20Uma_Entrada', depois: 'Texto Em Uma "
 "Entrada'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4750,18 +4816,18 @@ msgstr ""
 "O caractere de espaço é substituído por um underscore. Por exemplo, antes: "
 "'Texto Em Uma Entrada', depois: 'Texto_Em_Uma_Entrada'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 "Substituir uma seqüência por outra. Saiba que a busca é sensível à "
 "capitalização."
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4769,7 +4835,7 @@ msgstr ""
 "Converte todas as palavras em todos os campos para maiúsculas. Por exemplo, "
 "antes: 'Texto EM UMA entrada', depois: 'TEXTO EM UMA ENTRADA'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4777,7 +4843,7 @@ msgstr ""
 "Converte todas as palavras em todos os campos para minúsculas. Por exemplo, "
 "antes: 'TEXTO EM uma entrada', depois: 'texto em uma entrada'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4786,7 +4852,7 @@ msgstr ""
 "campos). Por exemplo, antes: 'Texto EM Uma ENTRADA', depois: 'Texto em uma "
 "entrada'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4795,7 +4861,7 @@ msgstr ""
 "campos). Por exemplo, antes: 'Texto em uma ENTRADA', depois: 'Texto Em Uma "
 "Entrada'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4804,15 +4870,15 @@ msgstr ""
 "Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: "
 "'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Insere um espaço antes de uma letra maiúscula"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Remove espaços ou underscores duplicados"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4820,7 +4886,7 @@ msgstr ""
 "Todos os espaços entre palavras são removidos. Por exemplo, antes: 'Texto Em "
 "Uma Entrada', depois: 'TextoEmUmaEntrada'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4828,7 +4894,7 @@ msgstr ""
 "Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: "
 "'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4839,183 +4905,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a: artista"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a: artista"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b: álbum"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c: comentário"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p: compositor"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r: copyright"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: número do disco"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: codificado por"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g: gênero"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: ignorado"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l: número de faixas"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: artista orig."
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n: faixa"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t: título"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y: ano"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Editor de Máscara"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Criar Nova Máscara"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Mover essa Máscara para Cima"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Mover essa Máscara para Baixo"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Duplicar Máscara"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Adicionar Máscaras Padrão"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Remover Máscara"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Salvar Máscaras"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nova_máscara"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Copiar: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Remover: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Mover para Cima: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Mover para Baixo: Nenhuma coluna selecionada!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ERRO: Não foi possível gravar o arquivo de configuração: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Não foi possível abrir o arquivo de configuração '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Carregando configuração padrão..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Não foi possível criar ou abrir o arquivo '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ERRO: Não foi possível gravar a lista para o arquivo: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Carregando as máscaras padrão de 'Preenchimento de Etiqueta..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Carregando as máscaras padrão de 'Renomear Arquivo'..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Carregando as máscaras padrão de 'Renomear Diretório'..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERRO: A variável de ambiente HOME não está definida!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERRO: Não foi possível criar o diretório '%s' (%s)!"
diff --git a/po/ro.gmo b/po/ro.gmo
index f74d9e1..b8adcfb 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index 53f87f9..1aefec6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,15 +1,16 @@
 # Romanian translation of EasyTAG.
 # Copyright (C) 2002-2005 Free Software Foundation, Inc.
 # Pauliuc George <pauliuc at gmx.net>, 2002, 2003, 2004, 2005.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 1.99.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2005-04-19 10:07+0200\n"
 "Last-Translator: Pauliuc George <romania at users.sourceforge.net>\n"
 "Language-Team: Romanian <pauliuc at gmx.net>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,6 +30,7 @@ msgstr ""
 "Interfata sa simpla (GTK+) face etichetarea mai simpla."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Traducerea germana)"
 
@@ -115,111 +117,111 @@ msgstr "(Traducerea germana)"
 msgid "(Serbian translation)"
 msgstr "(Traducerea germana)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Comentariu"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Despre..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Despre"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilat: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(folosind: GTK+ %d.%d.%d si id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Paginã de web: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Descriere:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Nu este destulã memorie"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Suportul pentru Ogg Vorbis dezactivat)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
@@ -227,33 +229,33 @@ msgstr "(Suportul pentru FLAC dezactivat)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Mulþumiri"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Traduceri:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "General:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Schimbari"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Nu pot deschide '%s' (%s)"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Eroare în timpul deschiderii fisierului: '%s' (%s)."
@@ -261,487 +263,497 @@ msgstr "Eroare 
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Fisier"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Ordoneaza lista de etichete :"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Ordoneaza lista dupa proprietati"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Crescator dupa numele de fisier"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Descrescator dupa numele de fisier"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Crescator dupa data creatiei"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Descrescator dupa data creatiei"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Crescator dupa numarul pistei"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Descrescator dupa numarul pistei"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Crescator dupa titlu"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Descrescator dupa titlu"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Crescator dupa artist"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Descrescator dupa artist"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Crescator dupa artist"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Descrescator dupa artist"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Crescator dupa album"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Descrescator dupa album"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Crescator dupa an"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Descrescator dupa an"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Crescator dupa gen"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Descrescator dupa gen"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Crescator dupa comentariu"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Descrescator dupa comentariu"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Crescator dupa compozitor"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Descrescator dupa compozitor"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Crescator dupa artistul initial"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Descrescator dupa artistul initial"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Crescator dupa dreptul de autor"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Descrescator dupa dreptul de autor"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Crescator dupa URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Descrescator dupa URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Crescator dupa numele codorului"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Descrescator dupa numele codorului"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Crescator dupa tipul de fisier"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Descrescator dupa tipul de fisier"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Crescator dupa dimensiunea fisierului"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Descrescator dupa lungimea fisierului"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Ordoneaza lista crescator dupa durata"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Ordoneaza lista descrescator dupa durata"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Ordoneaza lista crescator dupa bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Ordoneaza lista descrescator dupa bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Ordoneaza lista crescator dupa rata de esantionare"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Ordoneaza lista descrescator dupa rata de esantionare"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Deschide fisierul(-ele) cu ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Alege toate fisierele"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Deselecteaza toate fisierele"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Inveseaza alegerea"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Sterge fisierul(-ele)..."
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "Primul _fisier"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Primul fisier"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "_Precedentul fisier"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "/Fisier/_Precedentul fisier"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "/Fisier/Urmatorul fisier"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Urmatorul fisier"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "Ultimu_l fisier"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Ultimul fisier"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "Examineaza fi_sierul(-ele)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Examineaza fisierul(-ele)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "Ste_rge eticheta(-ele)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "/Fisier/Ste_rge eticheta(-ele)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "An_uleaza ultimele schimbari"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "An_uleaza ultimele schimbari"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "R_efa ultimele schimbari"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Refa ultimele schimbari"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "S_alveaza fisierul(-ele)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Salveaza fisierul(-ele)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "_Force Saving File(s)"
 msgstr "Examineaza fi_sierul(-ele)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "Force Saving File(s)"
 msgstr "Examineaza fisierul(-ele)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Anuleaza ultimele schimbari"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Refa ultimele schimbari"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Iesire"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Iesi"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Navigator"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Mergi în directorul _personal"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Mergi în directorul personal"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Mergi în directorul implicit"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Mergi în directorul personal"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Mergi în directorul personal"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Mergi în directorul personal"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Mergi în _directorul implicit"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Mergi în directorul implicit"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Fixeaza _calea curenta ca implicita"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Fixeazã calea curentã ca implicitã"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Arborescenta|Artist-Album"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Redenumeste directorul..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Reîncarcã directorul"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Navigheazã directorul cu ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Pliaza arborele"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Reîmprospateaza arborele"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "_Examinator"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Completeaza eticheta(-ele)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Completeaza eticheta(-ele)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Redenumeste fisierul(ele) si directorul..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Redenumeste fisierul(ele) si directorul"
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Prelucreaza cimpurile"
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Prelucreaza cimpurile"
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Diverse"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Cauta _fisierul(-ele)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Cauta fisierul(-ele)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Cauta _baza de date CD..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "Cautare CDDB"
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Încarca numele de fisiere din TXT..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Scriu playlist..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Executã playerul audio"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Setari"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Preferinte..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Preferinte..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Despre"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Opreºte acþiunea curentã"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "Optiuni ale numelui de _fisier"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Cauta fisierul(ele) in CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Navigheaza _subdirectoarele"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 #, fuzzy
 msgid "Show Hidden Directories"
 msgstr "Cauta directoarele ascunse"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Arata navigaotrul arborelui / Afiseaza dupa Artist si Album"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Nu pot uni interfata, eroarea a fost: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Gata sã pornesc..."
 
@@ -750,7 +762,7 @@ msgid "New default path for files selected"
 msgstr "Nouã cale implicitã pentru fiºierele alese"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Confirmãri..."
 
@@ -762,88 +774,93 @@ msgstr ""
 "Unele fiºiere au fost modificate dar nu au fost salvate...\n"
 "Doriþi sã le salvez înainte de a schimba directorul?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Albume"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Eroare: cautind %s, nu am gasit nodul %s in arbore."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Arbore"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Numele fiºierlui"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Titlu"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artist"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artist"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "An"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Pistã"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Gen"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Compozitor"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Artist initial"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Drept de autor"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Codor"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Albume"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Fisiere"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Mergi în directorul parinte"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Introduceþi un director de navigat."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Alegeþi un director de navigat!"
@@ -851,34 +868,34 @@ msgstr "Alege
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u fisier(e)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artist si Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Redenumeºte directorul"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Redenumeºte directorul '%s' : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Foloseste masca:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 #, fuzzy
 msgid "If activated, it will use masks to rename directory."
 msgstr "Daca este activata, lista va fi creata in directorul parinte.."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
@@ -888,32 +905,32 @@ msgstr ""
 "examina numele de fiºiere ºi calea. Folosit pentru a completa cîmpurile "
 "etichetei."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Mask de examinare invalid"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Previziualizeazã redenumirea fiºierului"
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Eroare..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Trebuie sã introduceþi un nume de director!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "Nu pot converti '%s' in codarea fisierului. Alegeti alt nume."
@@ -946,7 +963,7 @@ msgstr "Nu pot converti '%s' in codarea fisierului. Alegeti alt nume."
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -955,7 +972,7 @@ msgstr ""
 "Nu pot redenumi pentru cã acest nume de director existã deja!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -970,88 +987,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Director redenumit"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Program de executat :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Introduceþi programul de executat. O sã primeascã directorul curent ca "
 "parametru."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Deschide fisierul cu ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Introduceþi programul de executat. El va primi fiºierul curent ca parametru."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Trebuie sã introduceþi un nume de fiºier!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nu pot executa %s (%s)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Nu pot porni (fork) alt proces!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comanda executatã : '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Categorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Numãrul pistei"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Timp"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Cautare CD in baza de date"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Cautare automata"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Cere baza de date FreeDB:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1059,16 +1076,16 @@ msgstr ""
 "Cere automat baza CDDB folosit fisierele alese (ordinea e importanta!) "
 "pentru a genera CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr " Opreste cautarea...  "
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1079,138 +1096,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Cautare manuala"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Cuvinte :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Introduceþi cuvintele de cãutat (separate de un spaþiu sau '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Cautã în :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Toate cîmpurile"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Altele"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Toate categoriile"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Clasic"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Raggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "ColoanãSonorã"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclus: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "filme, spectacole"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "altele care nu se încadreazã în categoriile de mai sus"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " Categorii "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Rezultate :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Cãutare :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Introduceti cuvintele de cautat in lista de mai jos"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Cauta urmatorul"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Cauta precedentul"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Afisaza doar liniile rosii/toate liniile"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Deselecteaza toate liniile"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Inverseaza alegerea liniilor"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Alege toate liniile"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1224,36 +1241,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Fixeazã în :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Toate"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Pistã #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Piste"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Ruleaza examinatorul curent pentru fiecare fisier"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1262,91 +1279,95 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Incarca liniile alese sau toate liniile (daca nici una nu a fost aleasa)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Gata sã caut..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr "Album: '%s', artist: '%s', lungime: '%s', an: '%s', gen: '%s', ID '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Inverseaza alegerea"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Ordoneaza lista crescator dupa numar"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Ordoneaza dupa numele pistei"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Rezolv gazda '%s'..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nu pot rezolva gazda '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Nu pot crea o nouã mufã (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Mã conectez la gazda '%s', port '%d' ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nu mã pot conecta la gazda '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectat la gazda '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Eroare în timp ce ºtergeam eticheta ID3v1 de la '%s' (%s)\n"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nu pot crea sau deschide '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nu pot deschide '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Trimit cerere ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nu pot trimite cerere (%s)!"
@@ -1355,91 +1376,92 @@ msgstr "Nu pot trimite cerere (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Primesc datele ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Serverul a intors un raspuns gresit! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serverul a intors un raspuns gresit! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Regret, cautarea web este inaccesibila"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Am gãsit %d album(e)"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Nici un fisier ales!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fisier(e) alese!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Gata sã caut..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Trimit cererea (CddbId: %s, #piste: %d, Lungime disc: %d)..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Am gãsit %d album(e)"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Nu pot deschide '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Încarc lista de piste a albumului"
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1452,7 +1474,7 @@ msgstr ""
 "\n"
 "Continuati?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Scrie eticheta din CDDB..."
 
@@ -1710,7 +1732,7 @@ msgstr ""
 msgid "Browser"
 msgstr "Navigator"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Fiºier"
 
@@ -1724,11 +1746,11 @@ msgstr "Leg
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Strat ?"
 
@@ -1736,7 +1758,7 @@ msgstr "?, Strat ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1744,17 +1766,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frecvenþã:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mod:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1771,7 +1793,7 @@ msgid "Time:"
 msgstr "Timp:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Etichetã"
 
@@ -1800,46 +1822,57 @@ msgstr "Artist:"
 msgid "Tag selected files with this artist"
 msgstr "Eticheteaza toate fisierele cu artistul acesta"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artist:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Eticheteaza toate fisierele cu artistul acesta"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Eticheteaza fisierele alese cu albumul acesta"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Eticheteaza fisierele alese cu acest numar de disc"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "An:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Eticheteaza fisierele alese cu anul acesta"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numara pistele alese secvential. Porneste de la 01 în fiecare subdirector"
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Pistã #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1847,287 +1880,296 @@ msgstr ""
 "Alegeti numarul de fisiere, din acelasi director cu fisierul afisat, pentru "
 "pistele alese"
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Eticheteaza fisierele alese cu acest numar de piste"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Gen"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Eticheteaza fisierele alese cu acest gen"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Comentariu:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Eticheteaza fisierele alese cu acest comentariu"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Compozitor:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Eticheteaza fisierele alese cu acest compozitor"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Artist initial:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Eticheteaza toate fisierele cu artistul initial acesta"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Drept de autor:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Eticheteaza toate fisierele cu 'dreptul de autor' acesta"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Eticheteaza fisierele alese cu URL-ul acesta"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Codor:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Eticheteaza fisierele alese cu acest codor"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Imagini"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Imagini:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Puteti folosi 'drag and drop' pentru a adauga o imagine."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Eticheteaza fisierele alese cu aceste imagini"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Adauga imagini etichetei ('drag and drop' este disponibil)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Sterge imaginile alese sau toate imaginile."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salveaza imaginile alese pe hard disc"
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Alegeti proprietatile imaginilor alese."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Fisierele alese etichetate cu titlul '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Sters titlul din fisierele alese."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Toate fisierele etichetate cu artistul '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Sters artistul din toate fisierele."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Toate fisierele etichetate cu artistul '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Sters artistul din toate fisierele."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Fisierele alese etichetate cu albumul '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Sters albumul din fisierele alese."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Fisierele alese etichetate cu numarul de disc '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Sters numarul de disc din fisierele alese."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Fisierele alese etichetate cu anul '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Sters anul din fisierele alese."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Fisierele alese etichetate cu pista 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Fisierele alese etichetate cu pista 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Sters numarul pistei din fisierele alese."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Pistele alese etichetate secvential."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Fisierele alese etichetate cu genul '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Sters genul din fisierele alese."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Fisierele alese etichetate cu comentariul '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Sters comentariul din fisierele alese."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Fisierele alese etichetate cu compozitorul '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Sters compozitorul din fisierele alese."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Toate fisierele etichetate cu artistul initial '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Sters artistul intial din toate fisierele."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Toate fisierele etichetate cu 'dreptul de autor' '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Sters 'dreptul de autor' din toate fisierele."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Fisierele alese etichetate cu URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Sters URL din fisierele alese."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Fisierele alese etichetate cu codorul '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Sters codorul din fisierele alese."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Fisierele alese etichetate cu imagini '%s'."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Sters imaginile din fisierele alese."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Alegeþi modul ºi masca ºi refã aceeaºi actiune"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Toate etichetele au fost examinate"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Toate etichetele au fost ºterse"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Cauta fisierul(-ele)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Toate fiºierele au fost salvate..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Fisierele au fost partial sterse..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Toate fisierele au fost sterse..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2136,17 +2178,17 @@ msgstr ""
 "Doriþi sã scrieþi eticheta fiºierului\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Scriu eticheta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 #, fuzzy
 msgid "Rename File and Directory..."
 msgstr "Redenumeste fisierul si directorul"
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2160,12 +2202,12 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "Redenumeste directorul..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2179,11 +2221,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Redenumeºte fiºierul..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2196,17 +2238,17 @@ msgstr ""
 "în \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Scriu eticheta la '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Eticheta(le) scris(e)"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2215,21 +2257,21 @@ msgstr ""
 "Nu pot scrie eticheta în fiºierul '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Nu pot scrie eticheta în fiºierul '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Redenumesc fiºierul '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2242,7 +2284,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2251,11 +2293,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Fiºierul(ele) neredenumite..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2268,7 +2310,7 @@ msgstr ""
 "pentru cã urmãtorul fiºier deja existã:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2277,7 +2319,7 @@ msgstr ""
 "pentru cã urmãtorul fiºier deja existã:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2288,7 +2330,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2297,16 +2339,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Fiºier redenumit '%s' în '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Fisierul(ele) redenumite..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2317,7 +2359,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2326,18 +2368,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Fiºier redenumit '%s' în '%s'\n"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "Fisierul(ele) redenumite..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2350,7 +2392,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2359,12 +2401,12 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "Fiºierul(ele) neredenumite..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2373,16 +2415,16 @@ msgstr ""
 "Sigur doriti sa stergeti definitiv fisierul\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "ªterge fiºierul..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fisierul '%s' a fost sters"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2394,109 +2436,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Cãutare în curs..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Fiºier: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Gasit %d fisier(e) în acest director si subdirectoare."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Gasit %d fisier(e) în acest director."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fisier(e)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nici un fiºier nu a fost gãsit în acest director ºi subdirectoare!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Nici un fiºier nu a fost gãsit în acest director!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Caut..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  Opreºte cãutarea...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Alegeþi un director de navigat!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Eticheteaza fisierele alese cu titlul acesta"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Schimbã '_' ºi '%20' în spaþii"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Schimbã ' ' în '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Toate majuscule"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Toate minuscule"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Prima literã majusculã"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Prima literã a fiecãrui cuvînt majusculã"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "ªterge spaþiile"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Introdu spaþiu înainte de majusculã"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "ªterge spaþiile si underscores multiple"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Ieºire anormalã! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Primit semnalul %s (%d)\n"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2506,11 +2547,11 @@ msgstr ""
 "Probabil ati gasit o problema cu EasyTAG. Va rog sa trimiteti un raport cu "
 "gdb backtrace ('gdb easytag core' apoi 'bt') la easytag at gmail.com\n"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Semnal necunoscut"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2542,11 +2583,11 @@ msgstr ""
 "/calea_spre/fisiere   Folositi o cale absoluta pentru a încarca\n"
 "., ./                 Încarca directorul curent\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Ieºire normalã."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2554,85 +2595,85 @@ msgstr ""
 "Unele fiºiere au fost modificate dar nu ºi salvate...\n"
 "Doriþi sã le salvez înainte de ieºire?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " Sigur vreþi sã ieºiti din program? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "Etichetã ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Eticheta Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "Eticheta FLAC Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "Eticheta APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "Fiºier MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "Fiºier MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Fiºier Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "Urmatorul fisier"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "Fiºier FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "Fisier MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Fisier Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "Fiºier MP2"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "Fisier MusePack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Imagini"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2640,14 +2681,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2658,11 +2699,11 @@ msgstr ""
 "in codarea sistemului de fisiere\n"
 "(Incercati sa modificati variabila de mediu G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Optiuni ale conversiei numelui de fisier"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2687,56 +2728,56 @@ msgstr "Codor:"
 msgid "Channels:"
 msgstr "Schimbari"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "Eroare în timpul deschiderii fisierului: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "Eroare: Am eºuat sã scriu comentariile în fiºierul '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Eticheta de la '%s' scrisã"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "ªters eticheta de la '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Eroare în timp ce ºtergeam eticheta ID3v1 de la '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Eroare în timp ce ºtergeam eticheta ID3v2 de la '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Eroare în timp ce actualizam eticheta ID3v2 de la '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2751,84 +2792,84 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Eroare în timp ce actualizam eticheta ID3v1 de la '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Eticheta de la '%s' actualizatã"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Fãrã erori"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Nu este destulã memorie"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Nici o informaþie de examinat"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Date incorect formatate"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Nici o memorie tampon în care sã scriu"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Memoria tampon este prea micã"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Frame ID incorect"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Cîmpul cerut negasit"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Tip de cîmp necunoscut"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Eticheta este deja ataºatã unui fiºier"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Versiune de etichetã incorectã"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Nici un fiºier de examinat"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Încercare de scriere a unui fiºier disponibil doar pentru citire"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Eroare la compresie/decompresie"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Mesaj de eroare necunoscut!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "Salvati fisierul..."
@@ -2837,75 +2878,75 @@ msgstr "Salvati fisierul..."
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Alegeþi fiºierul..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Alegeþi directorul..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "Caut..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Nu pot executa %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Genereazã un playlist"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Numele M3U playlist"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Foloseºte numele de director"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Modificã mask"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Opþiuni playlist"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Include doar fisierele alese"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2913,29 +2954,29 @@ msgstr ""
 "Daca se activeaza doar fisierele alese vor fi scrise in \"playlist\". Altfel "
 "toate vor fi scrise."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Foloseºte calea completã pentru fiºierele din playlist"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Foloseºte calea relativã pentru fiºierele din playlist"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Creaza playlist in directorul parinte"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Daca este activata, lista va fi creata in directorul parinte.."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Foloseste separatorul de directoare din DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2943,23 +2984,23 @@ msgstr ""
 "Aceasta optiune schimba separatorul de directoare UNIX '/' in separatorul "
 "DOS '\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Conþinutul playlist"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Listã de fiºiere disponibile doar pentru scriere"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Scrie informaþiile folosind numele de fiºier"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Scrie informaþiile folosind :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2968,12 +3009,12 @@ msgstr ""
 "Fiºierul playlist '%s' existã deja!\n"
 "Suprascriu?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Scriu playlist..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2982,24 +3023,24 @@ msgstr ""
 "Nu pot scrie fiºierul playlist '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Am scris fiºierul playlist '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Codor"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Cautã un fiºier"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3007,95 +3048,95 @@ msgstr ""
 "afisa toate fisierele."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "În :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 #, fuzzy
 msgid "the File Name"
 msgstr "Nume de fiºier"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 #, fuzzy
 msgid "the Tag"
 msgstr "Scriu eticheta..."
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Cu majuscule seminifcative"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Gasit : %d fiºier(e)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Încarcã numele de fiºier dintr-un fiºier TXT"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Fiºier :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Încarcã "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Confirmã redenumirea fiºierului"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Introdu un spaþiu înainte de o majusculã"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "ªterge aceastã linie"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "ªterge toate liniile goale"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Include doar fisierele alese"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Include doar fisierele alese"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Reîncarcã"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Listã de fiºiere disponibile doar pentru scriere"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Alege toate liniile"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3104,20 +3145,20 @@ msgstr ""
 "examinatorul curent va fi rulat (fereastra examinatorului trebuie sa fie "
 "deschisa)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Introdu o linie goalã"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "ªterge aceastã linie"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Mutã sus aceastã mascã"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Mutã jos aceastã mascã"
@@ -3199,12 +3240,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "Eroare: Am eºuat sã deschis fiºierul: '%s' ca vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Atentie: Fisierul Ogg Vorbis '%s' contine o eticheta ID3V2."
@@ -3800,7 +3841,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3813,7 +3854,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3968,24 +4009,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Setul de caractere pentru etichetele ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Scrie etichetã ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Scrie etichetã ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3995,12 +4047,12 @@ msgstr ""
 "începutul fiºierelor MP3. Altfel eticheta va fi ºtearsã."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "Descriere:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4009,63 +4061,63 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Codor"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Setul de caractere folsit pentru a scrie etichetele in fisier."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr " Nu "
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etichetã ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Scrie etichetã ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4073,30 +4125,30 @@ msgstr ""
 "Dacã este activatã, o etichetã ID3v1 va fi adãugatã sau actualizatã la "
 "sfîrºitul fiºierelor MP3. Altfel va fi ºtearsã."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Setul de caractere folsit pentru a scrie etichetele in fisier."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Setul de caractere pentru etichetele ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4105,7 +4157,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "Setul de caractere folsit pentru a citi informatiile din etichete din fisier."
@@ -4113,24 +4165,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Examinator"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Schimba caracterele"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Schimbã '_' ºi '%20' în spaþii ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Schimbã spaþiile în '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4139,11 +4191,11 @@ msgstr ""
 "examinatorului de etichete."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Schimba caracterele"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4152,17 +4204,17 @@ msgstr ""
 "examinatorului de fisiere."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Process Fields Scanner - Character Conversion"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 #, fuzzy
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
@@ -4175,15 +4227,15 @@ msgstr ""
 "cuvint'."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Fereastra examinatorului"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Deschide fereastra examinatorului la pornire"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4191,11 +4243,11 @@ msgstr ""
 "Activaþi aceastã opþiune pentru a deschide automat freastra examinatorului "
 "cînd EasyTAG este pornit."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Fereastra examinatorului tot timpul deasupra"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4204,16 +4256,16 @@ msgstr ""
 "fereastra principalã."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Cîmpuri"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Suprascrie cîmpurile cînd examinezi etichetele"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4222,11 +4274,11 @@ msgstr ""
 "noul text. Dacã este dezactivatã, numai cîmpurile goale ale etichetei vor fi "
 "completate."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Fixeazã acest text drept comentariu implicit :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4235,13 +4287,13 @@ msgstr ""
 "comentariu cînd folosiþi 'Completeazã eticheta'."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Foloseste CRC32 drept comentariu implicit (numai pentru fisierele cu "
 "etichete ID3)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4252,46 +4304,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "Baza de date CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Cautare automata"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Nume :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "Calea CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Setãri server"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Baza de date CD"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "Calea CGI :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4300,59 +4352,59 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Setãri proxy"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Foloseºte proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Fixeazã active setãrile serverului proxy."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Nume gazda :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Numele serverlui proxy."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Portul serverlui proxy"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Nume utilizator:"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Numele utilizatorului serverlui proxy."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Parola utilizatorului:"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Parola utilizatorului serverlui proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Lista numelor de pista"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 #, fuzzy
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "Alegeti fisierul corespondent (conform cu pozitia sau DLM)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 #, fuzzy
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
@@ -4362,7 +4414,7 @@ msgstr ""
 "corespunzator in lista principala va fi ales de asemenea."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4371,15 +4423,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Confirmãri"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Confirmã ieºirea din program"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4387,57 +4439,61 @@ msgstr ""
 "Dacã este activatã, deschide o fereastrã de dialog sã cearã confirmarea "
 "înainte de pãrasirea programului."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Confirmã scrierea etichetei fiºierului"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Confirmã redenumirea fiºierului"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Confirma stergerea fisierului"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Confirmã scrierea playlist"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Aplicã modificãrile (dar nu salva) ºi închide aceastã fereastrã"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Închide fereastra fãrã sã salvezi"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Salveazã schimbãrile ºi închide fereastra"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Schimbãrile aplicate"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Configuraþia salvatã"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Configuraþia neschimbatã"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4448,58 +4504,58 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Nu este director"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Completeazã eticheta"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Redenumeste fisierul si directorul"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Prelucreazã fiºierele"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Eticheta examinatã cu succes..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Eticheta examinata cu succes...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Eroare la examinare: nu pot gãsi separatorul '%s' în '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 "Nu am putut converti numele de fisier '%s' in codarea sistemului de fisiere."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Noul nume de fiºier examinat cu succes..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Noul nume de fiºier examinat cu succes...(%s)"
@@ -4507,41 +4563,41 @@ msgstr "Noul nume de fi
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Examinarea etichetei ºi numelui de fiºier"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Examinator :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Alegeþi tipul de examinator"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Deschide fereastra examinatorului / Examinati fisierele alese"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Opþiunile examinatorului"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Aratã / ascunde editorul mask"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Aratã / ascunde legenda"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Închide aceastã fereastrã"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4551,15 +4607,15 @@ msgstr ""
 "etichetei."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Completeaza previzualizarea etichetei..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Pune calea actuala inaintea mastii"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4572,15 +4628,15 @@ msgstr ""
 "cale absoluta, altfel este relativ la vechea cale."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Previziualizeazã redenumirea fiºierului"
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Alegeþi cîmpurile:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4589,126 +4645,136 @@ msgstr ""
 "Alegeþi acelea care vã intereseazã."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Prelucrez cîmpul nume de fiºier"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Prelucrez cîmpul titlu"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Prelucrez cîmpul artist"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Prelucrez cîmpul artist"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Prelucrez cîmpul album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Prelucrez cîmpul gen"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Prelucrez cîmpul comentariu"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Prelucrez cîmpul compozitor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Prelucrez cîmpul artist initial"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Prelucrez cîmpul 'drept de autor'"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Prelucrez cîmpul URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Prelucrez cîmpul nume de codor"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Inveseazã alegerea"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Alege/dealege toate."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Schimbã '_' ºi '%20' în ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Conversie :"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "la : "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4716,7 +4782,7 @@ msgstr ""
 "Caracterul '_' sau ºirul '%20' sînt înlocuite de un spaþiu. Exemplu, "
 "înainte: 'Text%20Introdus_înainte', dupã: 'Text Introdus înainte'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4724,16 +4790,16 @@ msgstr ""
 "Spaþiul este înlocuit de un '_'. Examplu, înainte: 'text introdus', dupã: "
 "'text_introdus'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4741,7 +4807,7 @@ msgstr ""
 "Schimbã toate cuvintele în toate cîmpurile în majuscule. Exemplu, înainte "
 "'Text INTROUDS', dupã: 'TEXT INTRODUS'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4749,7 +4815,7 @@ msgstr ""
 "Schimbã toate cuvintele în toate cîmpurile în minuscule. Exemplu, înainte: "
 "'TEXT Înainte', dupã: 'text înainte'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4757,7 +4823,7 @@ msgstr ""
 "Schimbã iniþiala primului cuvînt în toate cîmpurile în majusculã. Exemplu "
 "înainte: 'tEXt înainte', dupã: 'Text Înainte'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4765,7 +4831,7 @@ msgstr ""
 "Schimbã iniþiala fiecãrui cuvînt în toate cîmpurile în majusculã. Exemplu "
 "înainte: 'tEXt înainte', dupã: 'Text Înainte'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4774,15 +4840,15 @@ msgstr ""
 "Un spaþiu este introdus înainte de fiecare majusculã. Exemplu, înainte: "
 "'TextÎnainte', dupã: 'Text Înainte'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Introdu un spaþiu înainte de o majusculã"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "ªterge spaþiile sau '_' multiple"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4790,7 +4856,7 @@ msgstr ""
 "Toate paþiile dintre cuvinte sã fie ºterse. Exemplu, înainte: 'Text "
 "Înainte', dupã: 'TextÎnainte'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4798,7 +4864,7 @@ msgstr ""
 "Un spaþiu este introdus înainte de fiecare majusculã. Exemplu, înainte: "
 "'TextÎnainte', dupã: 'Text Înainte'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4809,159 +4875,164 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legendã"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artist"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : artist"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : comentariu"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%c : compozitor"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r: drept autor"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: codat de"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : gen"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorat"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : numãr de piste"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%a : artist initial"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : pistã"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : titlu"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : an"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Editor de mãºti"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Creazã o mascã nouã"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Mutã sus aceastã mascã"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Mutã jos aceastã mascã"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Copiazã masca"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Adaugã o mascã implicitã"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "ªterge masca"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Salveazã masca"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Mascã nouã"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Copiazã: Nici un rînd ales!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "ªterge: Nici un rînd ales!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Mutã sus: Nici un rînd ales!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Mutã jos: Nici un rînd ales!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "Eroare: Nu pot scrie fisierul configuratie: %s (%s)\a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nu pot deschide fiºierul configuraþie '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Încarc configuraþia implicitã..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nu pot crea sau deschide '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4969,29 +5040,29 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Încarc mask 'Completeazã eticheta' implicit..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Încarc mask-ul 'Redenumeºte fiºierul' implicit..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Încarc mask-ul 'Redenumeºte fiºierul' implicit..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "Eroare: Variabila de mediu $HOME nu este definitã!\n"
 "\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "Eroare: Nu pot crea directorul '%s' (%s)!"
@@ -5402,8 +5473,9 @@ msgstr "Execut
 #~ "ID3v2.3 tags support only ISO-8859-1 and UTF-16. If disabled, it will "
 #~ "check automatically the right encoding to use."
 #~ msgstr ""
-#~ "Daca este activata, eticheta ID3 va fi scrisa cu setul de caractere ISO-"
-#~ "8859-1. Remarcati ca etichetele ID3v2.3 accepta doar ISO-8859-1 si UTF16"
+#~ "Daca este activata, eticheta ID3 va fi scrisa cu setul de caractere "
+#~ "ISO-8859-1. Remarcati ca etichetele ID3v2.3 accepta doar ISO-8859-1 si "
+#~ "UTF16"
 
 #, fuzzy
 #~ msgid "Use this character set translation for ID3 tags (for expert user) :"
diff --git a/po/ru.gmo b/po/ru.gmo
index 468947c..35a3925 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 522264a..119a510 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Easytag 1.99.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2005-12-24 12:57+0300\n"
 "Last-Translator: Andrey Astafiev <andrei at altlinux.ru>\n"
 "Language-Team: ALT Linux Translation <ru at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,6 +29,7 @@ msgstr ""
 "интерфейсом GTK+ для GNU/Linux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(перевод на немецкий)"
 
@@ -111,111 +113,111 @@ msgstr "(перевод на греческий)"
 msgid "(Serbian translation)"
 msgstr "(перевод на немецкий)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Комментарий"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "О программе..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "О программе"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(скомпилировано: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(используются: GTK+ %d.%d.%d и id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "Эл. адрес: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Веб-страница:"
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Описание:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Не хватает памяти"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(поддержка Ogg Vorbis отключена)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(поддержка FLAC отключена)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(поддержка MP4/AAC отключена)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(поддержка MP3 отключена)"
@@ -223,33 +225,33 @@ msgstr "(поддержка MP3 отключена)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Благодарности"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Переводы:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Общее:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Изменения"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Не открывается файл '%s' (%s)"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ОШИБКА при открытии файла: '%s' (%s)."
@@ -257,484 +259,494 @@ msgstr "ОШИБКА при открытии файла: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Файл"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Сортировка списка по тегу"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Сортировка списка по свойству"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "В порядке возрастания по имени файла"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "В порядке убывания по имени файла"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "В порядке возрастания по дате создания"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "В порядке убывания по дате создания"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "В порядке возрастания по номеру дорожки"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "В порядке убывания по номеру дорожки"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "В порядке возрастания по названию"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "В порядке убывания по названию"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "В порядке возрастания по исполнителю"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "В порядке убывания по исполнителю"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "В порядке возрастания по исполнителю"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "В порядке убывания по исполнителю"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "В порядке возрастания по альбому"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "В порядке убывания по альбому"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "В порядке возрастания по году"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "В порядке убывания по году"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "В порядке возрастания по жанру"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "В порядке убывания по жанру"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "В порядке возрастания по комментарию"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "В порядке убывания по комментарию"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "В порядке возрастания по композитору"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "В порядке убывания по композитору"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "В порядке возрастания по первому исполнителю"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "В порядке убывания по первому исполнителю"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "В порядке возрастания по владельцу авторских прав"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "В порядке убывания по владельцу авторских прав"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "В порядке возрастания по ссылке (URL)"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "В порядке убывания по ссылке (URL)"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "В порядке возрастания по названию кодировщика"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "В порядке убывания по кодировщику"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "В порядке возрастания по типу файла"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "В порядке убывания по типу файла"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "В порядке возрастания по размеру файла"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "В порядке убывания по размеру файла"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "В порядке возрастания по продолжительности"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "В порядке убывания по продолжительности"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "В порядке возрастания по скорости потока"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "В порядке убывания по скорости потока"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "В порядке возрастания по частоте дискретизации"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "В порядке убывания по частоте дискретизации"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Открыть файл(ы) с помощью..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Выделить все файлы"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Убрать выделение со всех файлов"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Инвертировать выделение файлов"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Удалить файл(ы)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "П_ервый файл"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Первый файл"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "_Предыдущий файл"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Предыдущий файл"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Следующий файл"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Следующий файл"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "П_оследний файл"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Последний файл"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "_Сканировать файл(ы)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Сканировать файл(ы)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Удалить тег(и)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Удалить тег(и)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Отменить посл. изменения в файлах"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Отменить посл. изменения в файлах"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Вернуть посл. изменения файлов"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Вернуть посл. изменения файлов"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Сохранить файл(ы)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Сохранить файл(ы)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "Сохранить _принудительно файл(ы)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Сохранить принудительно файл(ы)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Отменить последнее изменение"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Вернуть последнее изменение"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "В_ыйти"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Выйти"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Браузер"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Перейти к _домашнему каталогу"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Перейти к домашнему каталогу"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Перейти к каталогу по умолчанию"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Перейти к домашнему каталогу"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Перейти к домашнему каталогу"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Перейти к домашнему каталогу"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Перейти к _каталогу по умолчанию"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Перейти к каталогу по умолчанию"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Открывать _этот каталог по умолчанию"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Открывать этот каталог по умолчанию"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Дерево каталогов | Группировка по исполнителю и альбому"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Переименовать к_аталог..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Обновить каталог"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Просмотреть каталог с помощью..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Свернуть дерево"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Обновить дерево"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "С_канер"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Заполнить тег(и)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Заполнить тег(и)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "Переименовать файл(ы) и к_аталог..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Переименовать файл(ы) и каталог..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Обработать поля..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Обработать поля..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Разное"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Поиск _файла(ов)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "_Найти файл(ы)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Поиск в CDD_B..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "Поиск в CDDB..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Загрузить список файлов из файла"
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Сохранить список записей..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Запустить проигрыватель"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Установки"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Настройки..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Настройки..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_О программе"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Остановить текущее действие"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Действия с файлами"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Найти файл(ы) в CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Просматривать _подкаталоги"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Показать скрытые каталоги"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Показывать дерево каталогов / Отображать по исполнителю и альбому"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Не могу объединить, ошибка: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Готов к запуску..."
 
@@ -743,7 +755,7 @@ msgid "New default path for files selected"
 msgstr "Выбран новый путь по умолчанию для файлов"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Подтвердить..."
 
@@ -755,88 +767,93 @@ msgstr ""
 "Некоторые файлы были изменены, но не сохранены...\n"
 "Сохранить изменения перед сменой каталога?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Альбомы"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Ошибка: Поиск %s, не удалось найти узел %s в дереве."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Дерево"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Имя файла"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Название"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Исполнитель"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Альбом"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Год"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Дорожка"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Первый исполнитель"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Авторство"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "Ссылка (URL)"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Кодировщик"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Альбомы"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Файлы"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Перейти на уровень выше"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Перейти к каталогу"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Выберите каталог для просмотра!"
@@ -844,33 +861,33 @@ msgstr "Выберите каталог для просмотра!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u файл(ов)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Исполнитель и альбом"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Переименовать каталог"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Переименовать каталог '%s' в:"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Использовать маску:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Если выбрано, маски будут использоваться для переименования каталогов."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -878,31 +895,31 @@ msgstr ""
 "Выберите или введите маску, используя приведённые в подсказке, для "
 "переименования каталога из полей тегов."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Недопустимая маска для сканера"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Предварительное переименование каталогов..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Ошибка..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Необходимо ввести имя каталога!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -937,7 +954,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -946,7 +963,7 @@ msgstr ""
 "Невозможно переименовать, так как каталог с таким именем уже существует!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -961,87 +978,87 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Каталог переименован"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Программа для запуска:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Введите имя программы. В качестве параметра ей будет передан текущий каталог."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Открыть файл с помощью..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Введите имя программы. В качестве параметра ей будет передан текущий файл."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Необходимо ввести название программы!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Программа '%s' не найдена!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Не могу выполнить %s (ошибка %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Не удалось создать новый процесс!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Выполненная команда: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Исполнитель / альбом"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Категория"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Название дорожки"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Время"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Поиск в базе данных компакт-дисков"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Автоматический поиск"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Запрос к базе FreeDB:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1049,16 +1066,16 @@ msgstr ""
 "Автоматически обращаться к базе CDDB, используя выделенные файлы (порядок "
 "важен!), для получения CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Остановить поиск..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1069,138 +1086,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Самостоятельный поиск"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Слова:"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Введите слова для поиска, разделённые пробелами или '+'"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Поиск в:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Все поля"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Прочее"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Все категории"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Блюз"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Классика"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Кантри"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Фолк"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Джаз"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Разное"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Новая волна"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Регги"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Рок"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Дорожка к фильму"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "включает: фанк, соул, рэп, поп, индастриал, метал и т.д."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "фильмы, постановки"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "остальные, не попавшие в указанные категории"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Категории"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Результаты:"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Поиск:"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Введите слова для поиска в списке внизу"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Поиск вперёд"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Поиск назад"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Показывать красные строки / все строки"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Отменить выделение"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Инвертировать выделение"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Выделить все строки"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1213,36 +1230,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Установить в:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Все"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Дорожка #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# дорожки"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Выполнить сканирование для каждого файла"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1254,15 +1271,15 @@ msgstr ""
 "использоваться для сравнения названий из CDDB с именами файлов в текущем "
 "каталоге и выбора лучших совпадений."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Загрузить выделенные строки или все строки (если нет выделенных)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Готов к поиску..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1270,76 +1287,80 @@ msgstr ""
 "Альбом: '%s', исполнитель: '%s', общее время: '%s', год: '%s', жанр: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Инвертировать выделение"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Сортировать по номеру дорожки"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Сортировать по имени дорожки"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Поиск узла '%s' ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Не удалось найти узел '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Не удалось создать новое соединение (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Подключение к серверу '%s', порт '%d'..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Не удалось подключиться к серверу '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Установлено соединение с '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Ошибка при удалении тега ID3v1 в '%s' (%s)\n"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не удалось создать или открыть файл '%s' (%s)\n"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Не открывается файл '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Отправляется запрос..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Не удалось отправить запрос (%s)!"
@@ -1348,91 +1369,92 @@ msgstr "Не удалось отправить запрос (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Получение данных..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Сервер вернул неправильный ответ! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сервер вернул неправильный ответ! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Поиск в веб сейчас недоступен!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Найдено %d подходящих альбомов"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Нет выделенного файла!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "Выделено %d файл(ов)!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Готов к поиску..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Отправляется запрос (CddbId: %s, #дорожек: %d, общее время: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Найдено %d подходящих альбомов"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Не открывается файл '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Загружается список дорожек альбома..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1445,7 +1467,7 @@ msgstr ""
 "\n"
 "Продолжить?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Записывается тег из CDDB..."
 
@@ -1704,7 +1726,7 @@ msgstr ""
 msgid "Browser"
 msgstr "Браузер"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Файл"
 
@@ -1718,11 +1740,11 @@ msgstr "Недействительная ссылка на файл"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Уровень ?"
 
@@ -1730,7 +1752,7 @@ msgstr "?, Уровень ?"
 msgid "Bitrate:"
 msgstr "Скорость потока:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? кб/c"
 
@@ -1738,17 +1760,17 @@ msgstr "? кб/c"
 msgid "Freq:"
 msgstr "Частота:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Гц"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Режим:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1765,7 +1787,7 @@ msgid "Time:"
 msgstr "Время:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Тег"
 
@@ -1794,35 +1816,46 @@ msgstr "Исполнитель:"
 msgid "Tag selected files with this artist"
 msgstr "Записать в теги выделенных файлов исполнителя"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Исполнитель:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Записать в теги выделенных файлов исполнителя"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Альбом:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Записать в теги выделенных файлов название альбома"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Записать в теги выделенных файлов номер диска"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Год:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Записать в теги выделенных файлов год"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Выбранные дорожки последовательно нумеруются. В каждом подкаталоге нумерация "
@@ -1830,11 +1863,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Номер дорожки:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1842,287 +1875,296 @@ msgstr ""
 "Записать число, равное количеству файлов в том же каталоге с отображаемым "
 "файлом, в выделенные файлы."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Записать в теги выделенных файлов число дорожек"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Жанр:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Записать в теги выделенных файлов жанр"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Записать в теги выделенных файлов комментарий"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Композитор:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Записать в теги выделенных файлов композитора"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Первый исполнитель:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Записать в теги выделенных файлов первого исполнителя"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Авторское право:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Записать в теги выделенных файлов авторское право"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "Ссылка (URL):"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Записать в теги выделенных файлов ссылку (URL)"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Кодировщик:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Записать в теги выделенных файлов кодировщик"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Картинки"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Картинки:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Для добавления картинки можно использовать перетаскивание."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Записать картинки в теги выделенных файлов"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Добавить картинки в тег."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Удалить все или выбранные картинки"
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Сохранить выделенные картинки на диск."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Установить свойства для выделенных картинок."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "В теги выделенных файлов записано название '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "В выбранных файлах удалено поле 'Название'."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "В теги выделенных файлов записан исполнитель '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "В выбранных файлах удалено поле 'Исполнитель'."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "В теги выделенных файлов записан исполнитель '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "В выбранных файлах удалено поле 'Исполнитель'."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "В теги выделенных файлов записан альбом '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "В выбранных файлах удалено поле 'Альбом'."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "В теги выделенных файлов записан номер диска '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "В выбранных файлах удалено поле 'Номер диска'."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "В теги выделенных файлов записан год '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "В выбранных файлах удалено поле 'Год'."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "В выделенных файлах поле 'Дорожка' будет выглядеть так: 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "В выделенных файлах поле 'Дорожка' будет выглядеть так: 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "В выбранных файлах удалено поле 'Номер дорожки'."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Выделенные дорожки последовательно пронумерованы."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "В теги выделенных файлов записан жанр '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "В выбранных файлах удалено поле 'Жанр'."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "В теги выделенных файлов записан комментарий '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "В выбранных файлах удалено поле 'Комментарий'."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "В теги выделенных файлов записан композитор '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "В выбранных файлах удалено поле 'Композитор'."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "В теги выделенных файлов записан первый исполнитель '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "В выбранных файлах удалено поле 'Первый исполнитель'."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "В теги выделенных файлов записано авторское право '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "В выбранных файлах удалено поле 'Авторское право'."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "В теги выделенных файлов записана ссылка (URL) '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "В выбранных файлах удалено поле 'Ссылка (URL)'."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "В теги выделенных файлов записан кодировщик '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "В выбранных файлах удалено поле 'Кодировщик'."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "В выделенные файлы записаны картинки"
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Картинки удалены из выделенных файлов"
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Выберите Режим и Маску и повторите действие еще раз"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Все теги были просканированы"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Все теги были удалены"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "_Найти файл(ы)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Все файлы были сохранены..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Часть файлов была удалена..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Все файлы были удалены..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2131,16 +2173,16 @@ msgstr ""
 "Записать тег в файл\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Запись тега..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Переименование файла и каталога..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2154,11 +2196,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Переименование каталог..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2172,11 +2214,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Переименование файла..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2189,17 +2231,17 @@ msgstr ""
 "в\n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Записывается тег файла '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Тег(и) записан(ы)"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2208,21 +2250,21 @@ msgstr ""
 "Не удалось записать тег в файл '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Не удалось записать тег в файл '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Переименование файла '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2235,7 +2277,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2244,11 +2286,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Файл(ы) не переименован(ы)..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2261,7 +2303,7 @@ msgstr ""
 "Файл с таким именем уже существует:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2270,7 +2312,7 @@ msgstr ""
 "Файл с таким именем уже существует:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2281,7 +2323,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2290,16 +2332,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Файл '%s' переименован в '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Файл(ы) переименован(ы)..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2310,7 +2352,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2319,17 +2361,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Файл '%s' переименован в '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Файл(ы) перемещены..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2342,7 +2384,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2351,11 +2393,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Файл(ы) не перемещены..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2364,16 +2406,16 @@ msgstr ""
 "Удалить файл\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Удалить файл..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Файл '%s' удалён"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2385,109 +2427,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Выполняется поиск..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Файл: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Найдено %d файлов в каталоге и его подкаталогах."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "В каталоге найдено %d файл(ов)."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u файл(ов)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "В этом каталоге и его подкаталогах  файлы не найдены!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "В этом каталоге файлы не найдены!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Поиск..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "Остановить поиск..."
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Выберите каталог для просмотра!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Записать это поле в теги выделенных файлов"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Преобразовать '_' и '%20' в пробелы"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Преобразовать ' ' в '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Всё заглавными"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Всё строчными"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Первая заглавная"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Каждое слово начинается с заглавной буквы"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Удалить пробелы"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Вставить пробел перед заглавной буквой"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Удалять повторяющиеся пробелы и подчёркивания"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Выход из-за сбоя!. (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Получен сигнал %s (%d)\a\n"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2497,11 +2538,11 @@ msgstr ""
 "ошибке с текстом обратной трассировки, создаваемым программой gdb ('gdb "
 "easytag core' затем  'bt' и 'l') по адресу easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Неизвестный сигнал"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2534,11 +2575,11 @@ msgstr ""
 "путь_к/файлам     Использовать относительный путь.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Выход."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2546,84 +2587,84 @@ msgstr ""
 "Есть несохраненные изменения...\n"
 "Записать их перед выходом?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "Вы действительно хотите закрыть программу?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "Тег ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Тег Ogg Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "Тег FLAC Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "Тег APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "Тег MP4/M4A/AAC"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "файл MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "файл MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "файл Ogg Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "Следующий файл"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "файлов FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "файл MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "файл Monkey's Audio "
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "файл MP4/AAC"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "файл MusePack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Картинки"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2631,14 +2672,14 @@ msgid "%d kb/s"
 msgstr "%d кб/с"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Гц"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2649,11 +2690,11 @@ msgstr ""
 "в системную кодировку для имён файлов\n"
 "(Попробуйте установить переменную окружения G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Перевод имени файла"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Длина имени файла '%s' больше, чем %d, и будет усечено!\n"
@@ -2677,56 +2718,56 @@ msgstr "Кодировщик:"
 msgid "Channels:"
 msgstr "Каналы:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ОШИБКА при открытии файла: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ОШИБКА: Не удалось записать комментарии в файл '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Записан тег файла '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Удалён тег в '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Ошибка при удалении тега ID3v1 в '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Ошибка при удалении тега ID3v2 в '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Ошибка при обновлении тега ID3v2 в '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2741,77 +2782,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Ошибка при обновлении тега ID3v1 в '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Обновлён тег в '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Сообщений об ошибках не было"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Не хватает памяти"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Нет данных для анализа"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Неправильно отформатированные данные"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Нет буфера для записи"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Буфер слишком мал"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Недопустимый ID фрейма"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Запрашиваемое поле не найдено"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Неизвестный тип поля"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Тег уже прикреплён к файлу"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Неправильная версия тега"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Нет файла для анализа"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Попытка записи в файл только для чтения"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Ошибка при компрессии/декомпрессии"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Неизвестное сообщение об ошибке!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2820,7 +2861,7 @@ msgstr ""
 "Повреждённый файл: '%s'\n"
 "приведёт к ошибке в библиотеке id3lib, поэтому не будет обрабатываться."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Повреждённый файл..."
 
@@ -2828,75 +2869,75 @@ msgstr "Повреждённый файл..."
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Выберите файл..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Выберите каталог..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "Поиск..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Не удалось выполнить %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "Б"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "КБ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "МБ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "ГБ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "ТБ"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Создать список записей"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Название списка записей M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Использовать имя каталога"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Редактировать маски"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Параметры списка записей"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Включать только выделенные файлы"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2904,51 +2945,51 @@ msgstr ""
 "Если выбрано, только выделенные файлы будут помещаться в список записей, "
 "иначе будут использованы все файлы."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Использовать абсолютный путь для файлов в списке записей"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Использовать относительный путь для файлов в списке записей"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Создавать список записей в родительском каталоге"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Если выбрано, список записей будет создаваться в родительском каталоге"
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Использовать разделитель каталогов DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "Заменить разделитель каталогов '/' на разделитель в стиле DOS '\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Содержимое списка записей"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Записать только список файлов"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Записать информацию, используя имя файла"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Записать информацию используя:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2957,12 +2998,12 @@ msgstr ""
 "Файл списка записей '%s' уже существует!\n"
 "Перезаписать его?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Сохранить список записей..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2971,116 +3012,116 @@ msgstr ""
 "Не удалось сохранить список записей  '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Сохранён список записей '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Кодировщик"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Искать файл"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "Введите слово для поиска в файлах. "
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "Ð’:"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "Имя файла"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "Тег"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Найден(о): %d файл(ов)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Загрузить имена файлов из файла"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Файл:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr "Загрузить"
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Подтверждать переименования файла"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Вставить пробел перед заглавной буквой"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Удалить эту строку"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Удалить все пустые строки"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Включать только выделенные файлы"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Включать только выделенные файлы"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Перезагрузить"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Записать только список файлов"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Выделить все строки"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3088,20 +3129,20 @@ msgstr ""
 "Если выбрано, то после загрузки всех имен файлов текущие установки сканера "
 "будут применены (окно сканера должно быть открыто)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Вставить пустую строку"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Удалить эту строку"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Переместить выбранную маску вверх"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Переместить выбранную маску вниз"
@@ -3182,12 +3223,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "Ошибка при попытке открыть файл '%s' как Vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Внимание: Файл Ogg Vorbis '%s' содержит тег ID3v2."
@@ -3772,8 +3813,8 @@ msgid ""
 msgstr ""
 "Если выбрано, будет осуществлена попытка преобразования в кодировку, "
 "соответвующую текущей локали (например:  ISO-8859-1 для 'fr', KOI8-R для "
-"'ru', ISO-8859-2 для 'ro'). В случае ошибки будет выбрана кодировка ISO-8859-"
-"1."
+"'ru', ISO-8859-2 для 'ro'). В случае ошибки будет выбрана кодировка "
+"ISO-8859-1."
 
 #: src/prefs.c:551
 msgid ""
@@ -3781,7 +3822,7 @@ msgid ""
 msgstr ""
 "Принудительно использовать системную кодировку и активировать транслитерацию"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3798,7 +3839,7 @@ msgstr ""
 "Принудительно использовать системную кодировку и игнорировать некорректные "
 "символы"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3954,24 +3995,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "Кодировка для тегов ID3"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "Записывать тег ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Записывать тег ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -3981,12 +4033,12 @@ msgstr ""
 "Иначе они будут отрезаны."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "Описание:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3995,37 +4047,37 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "Юникод (Unicode) (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "Кодировщик"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Кодировка, используемая для записи тега в файл."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr "Нет"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4035,26 +4087,26 @@ msgstr ""
 "Если выбрано, символ, которого нет в целевой кодировке, может быть "
 "представлен с помощью одного или нескольких похожих символов."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Тег ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Записывать тег ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4062,30 +4114,30 @@ msgstr ""
 "Если выбрано, теги ID3v1 будут добавлены или обновлены в конце МР3 файлов. "
 "Иначе они будут отрезаны."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Кодировка, используемая для записи тега в файл."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Кодировка для тегов ID3"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4097,36 +4149,36 @@ msgstr ""
 "тегов сохранённых в кодировке ISO-8859-1 (для тегов ID3v1 и/или ID3v2).\n"
 "\n"
 "Например:\n"
-"- в предыдущих версиях EasyTAG можно было сохранять строки UTF-8 в поле ISO-"
-"8859-1, что некорректно. Для перекодировки этих тегов в Unicode: выберите "
-"эту опцию и выделите UTF-8.- если Unicode не используется, можно выбрать "
-"другую корировку."
+"- в предыдущих версиях EasyTAG можно было сохранять строки UTF-8 в поле "
+"ISO-8859-1, что некорректно. Для перекодировки этих тегов в Unicode: "
+"выберите эту опцию и выделите UTF-8.- если Unicode не используется, можно "
+"выбрать другую корировку."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Кодировка, используемая для чтения тега в файле."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Сканер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Сканер заполнения тегов - Преобразование символов"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Заменять подчеркивания '_' и строки '%20' на пробелы ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Преобразовывать пробел ' ' в подчёркивание '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4135,11 +4187,11 @@ msgstr ""
 "сканера для тегов."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Сканер переименования файлов - Преобразование символов"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4148,17 +4200,17 @@ msgstr ""
 "сканера для имён файлов."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Сканер обработки полей - Преобразование символов"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Не переводить в верхний регистр первые буквы предлогов и артиклей."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4170,15 +4222,15 @@ msgstr ""
 "слово начинается с заглавной буквы'."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Окно сканера"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Открывать окно сканера при запуске"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4186,11 +4238,11 @@ msgstr ""
 "Если выбрано, окно сканера будет появляться автоматически при загрузке "
 "EasyTAG."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Окно сканера всегда поверх других окон"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4198,16 +4250,16 @@ msgstr ""
 "Если выбрано, окно с масками будет всегда находиться поверх главного окна."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Поля"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Заменять поля при сканировании тегов"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4215,11 +4267,11 @@ msgstr ""
 "Если выбрано, сканер будет заменять существующий текст в полях на новый, "
 "иначе будут заполняться только пустые поля."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Комментарий по умолчанию:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4228,13 +4280,13 @@ msgstr ""
 "использовании сканера заполнения тегов."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Записывать контрольную сумму CRC32 в поле 'Комментарий' (только для тегов "
 "ID3)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4245,46 +4297,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "База данных CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Автоматический поиск"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Имя:"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Порт сервера:"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "Путь к CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Установки сервера"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "База данных CD"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "Путь к CGI:"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4293,58 +4345,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Настройки прокси-сервера"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Использовать прокси"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Активировать настройки прокси-сервера."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Имя сервера:"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Имя прокси-сервера."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Порт прокси-сервера."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Имя пользователя:"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Имя для авторизации на прокси-сервере."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Пароль:"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Имя для авторизации на прокси-сервере."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Список названий дорожек"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "Выберите соответствующий файл (в зависимости от позиции или DLM)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4353,7 +4405,7 @@ msgstr ""
 "будет выделен соответствующий файл."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4364,15 +4416,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Подтверждения"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Подтверждать выход из программы"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4380,57 +4432,61 @@ msgstr ""
 "Если выбрано, перед выходом из приложения будет появляться диалоговое окно "
 "для подтверждения."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Подтверждать запись тега в файл"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Подтверждать переименования файла"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Подтверждать удаление файла"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Подтверждать сохранение списка записей"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Применить изменения (но не сохранять) и закрыть это окно"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Закрывать это окно без сохранения"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Сохранить изменения и закрыть окно"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример : %.*d_-_Название_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Изменения применены"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Настройки сохранены"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Настройки не изменились"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4441,57 +4497,57 @@ msgstr ""
 "'%s'\n"
 " (%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Не является каталогом"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Проигрыватель аудиофайлов '%s' не найден!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Заполнить тег"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Переименовать файл и каталог"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Обработать поля"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Теги успешно прочитаны..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Теги успешно прочитаны...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Ошибка сканирования: не найден разделитель '%s' в '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Не удалось преобразовать '%s' в системную кодировку для имён файлов."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Новое имя файла было просканировано..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Новое имя файла было просканировано...(%s)"
@@ -4499,41 +4555,41 @@ msgstr "Новое имя файла было просканировано...(%s
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Сканер тегов и имён файлов"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Сканер:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Выберите тип используемого сканера"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Открыть окно сканера / Сканировать выбранные файлы"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Параметры сканера"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Показать/скрыть редактор масок"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Показать/скрыть подсказку"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Закрыть это ок_но"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4542,15 +4598,15 @@ msgstr ""
 "пути и имени файла. Используется для заполнения полей тегов."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Предварительный просмотр заполнения тега"
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Добавить к маске текущий путь"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4563,15 +4619,15 @@ msgstr ""
 "абсолютный, иначе относительный."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Предварительный просмотр переименования файла"
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Выбрать поля:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4580,134 +4636,144 @@ msgstr ""
 "которые вас интересуют."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Обработать поле 'Имя файла'"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Обработать поле 'Название'"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Обработать поле 'Исполнитель'"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Обработать поле 'Исполнитель'"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Обработать поле 'Альбом'"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Обработать поле 'Жанр'"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Обработать поле 'Комментарий'"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Обработать поле 'Композитор'"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Обработать поле 'Первый исполнитель'"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Обработать поле 'Авторское право'"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Обработать поле 'Ссылка (URL)'"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Обработать поле 'Кодировщик'"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Инвертировать выделение"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Выделить/Снять выделение"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Преобразовать '_' и '%20' в ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Преобразовать:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "в: "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
-"Подчеркивание или подстрока '%20' будет заменены на пробел. Например, 'Текст%"
-"20В_Поле' будет заменено на 'Текст В Поле'."
+"Подчеркивание или подстрока '%20' будет заменены на пробел. Например, 'Текст"
+"%20В_Поле' будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4715,16 +4781,16 @@ msgstr ""
 "Пробел будет заменён на подчеркивание. Например, 'Текст В Поле' будет "
 "заменено на 'Текст_В_Поле'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4732,7 +4798,7 @@ msgstr ""
 "Все слова во всех полях будут переведены в верхний регистр. Например, 'Текст "
 "В Поле' будет заменено на 'ТЕКСТ В ПОЛЕ'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4740,7 +4806,7 @@ msgstr ""
 "Все слова во всех полях будут переведены в нижний регистр. Например, 'ТексТ "
 "В Поле' будет заменено на 'текст в поле'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4748,7 +4814,7 @@ msgstr ""
 "Первые слова во всех полях будут начинаться с заглавной буквы. Например, "
 "'текст В Поле' будет заменено на 'Текст в поле'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4756,7 +4822,7 @@ msgstr ""
 "Все слова во всех полях будут начинаться с заглавной буквы. Например, 'текст "
 "в Поле' будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4765,15 +4831,15 @@ msgstr ""
 "Перед каждой заглавной буквой будет вставлен пробел. Например, 'ТекстВПоле' "
 "будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Вставить пробел перед заглавной буквой"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Удалить повторяющиеся пробелы или подчёркивания"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4781,7 +4847,7 @@ msgstr ""
 "Все пробелы между словами будут удалены. Например, 'Текст В Поле' будет "
 "заменено на 'ТекстВПоле'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4789,7 +4855,7 @@ msgstr ""
 "Перед каждой заглавной буквой будет вставлен пробел. Например, 'ТекстВПоле' "
 "будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4800,161 +4866,166 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Подсказка"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a: Исполнитель"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a: Исполнитель"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b: Альбом"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c: Комментарий"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p: Композитор"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r: Авторское право"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: номер диска"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: Кодировщик"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g: Жанр"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: Не используется"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l: Количество дорожек"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: Первый исполнитель"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n: Дорожка"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t: Название"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u: Ссылка (URL)"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y: Год"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Редактор масок"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Создать новую маску"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Переместить выбранную маску вверх"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Переместить выбранную маску вниз"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Дублировать маску"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Удалить маски по умолчанию"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Удалить маску"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Сохранить маски"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Новая_маска"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Копирование: Нет выбранных строк!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Удаление: Нет выбранных строк!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Вниз: Строка не выбрана!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Вверх: Строка не выбрана!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "ОШИБКА: Не удалось сохранить файл настроек: %s (%s)\n"
 "\a"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не удалось открыть файл настроек '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Загружаются настройки по умолчанию..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не удалось создать или открыть файл '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4962,28 +5033,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Загрузка масок по умолчанию для заполнения тегов..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Загрузка масок по умолчанию для переименования файлов..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Загрузка начальных масок для переименования каталогов..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "ОШИБКА: Переменная окружения HOME не определена!\n"
 "\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ОШИБКА: Не удалось создать каталог '%s' (%s)!"
@@ -5473,8 +5544,8 @@ msgstr "Запустить проигрыватель"
 #~ "set. Note that ID3v2.3 tags support only ISO-8859-1 and UTF16."
 #~ msgstr ""
 #~ "Если выбрано, тег ID3 будет записан в кодировке ISO-8859-1. Обратите "
-#~ "внимание на то, что теги версии 2.3 поддерживают только кодировки ISO-"
-#~ "8859-1 и UTF16."
+#~ "внимание на то, что теги версии 2.3 поддерживают только кодировки "
+#~ "ISO-8859-1 и UTF16."
 
 #~ msgid "Use this character set translation for ID3 tags :"
 #~ msgstr "Использовать эту перекодировку для тегов ID3:"
diff --git a/po/sr.gmo b/po/sr.gmo
index cfa1a12..faf91c0 100644
Binary files a/po/sr.gmo and b/po/sr.gmo differ
diff --git a/po/sr.po b/po/sr.po
index 1114368..eef9f1d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG-2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-09-04 09:53+0100\n"
 "Last-Translator: Милош Поповић <gpopac at gmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Serbian\n"
 "X-Poedit-Country: SERBIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -31,6 +32,7 @@ msgstr ""
 "лепо ГТК+ окружење чини означавање у ГНУ/Линуксу системима лакшим."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Немачки превод)"
 
@@ -112,111 +114,111 @@ msgstr "(Хебрејски превод)"
 msgid "(Serbian translation)"
 msgstr "(Немачки превод)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Коментар"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "О програму..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "О програму"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Превео: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(Користи: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Аутор: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "Мејл адреса: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Интернет страница: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Опис:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Подршка за MP3 датотеке је искључена)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(ID3v2.3 ознаке су искључене)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Немате доступну меморију"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Подршка за Ogg Vorbis датотеке је искључена)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Подршка за Speex датотеке је искључена)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Подршка за FLAC датотеке је искључена)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Подршка за MP4/AAC датотеке је искључена)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Подршка за WavPack датотеке је искључена)"
@@ -224,33 +226,33 @@ msgstr "(Подршка за WavPack датотеке је искључена)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Захвалност"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Преводи:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Опште:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Промене"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Не могу да отворим датотеку „%s“ (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Грешка при отварању датотеке: „%s“ (%s)."
@@ -258,484 +260,494 @@ msgstr "Грешка при отварању датотеке: „%s“ (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Датотека"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Сортирај листу по ознаци"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Сортирај листу по својству датотеке"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Растуће, по имену датотеке"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Опадајуће, по имену датотеке"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Растуће, по датуму настанка"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Опадајуће, по датуму настанка"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Растуће, по броју нумере"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Опадајуће, по броју нумере"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Растуће, по наслову"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Опадајуће, по наслову"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Растуће, по извођачу"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Опадајуће, по извођачу"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Растуће, по извођачу"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Опадајуће, по извођачу"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Растуће, по албуму"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Опадајуће, по албуму"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Растуће, по години"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Опадајуће, по години"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Растуће, по жанру"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Опадајуће, по жанру"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Растуће, по коментару"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Опадајуће, по коментару"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Растуће, по композитору"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Опадајуће, по композитору"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Растуће, по оригиналном извођачу"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Опадајуће, по оригиналном извођачу"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Растуће, по ауторским правима"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Опадајуће, по ауторским правима"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Растуће, по УРЛ"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Опадајуће, по УРЛ"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Растуће, по имену кодера"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Опадајуће, по имену кодера"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Растуће, по типу датотеке"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Опадајуће, по типу датотеке"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Растуће, по величини датотеке"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Опадајуће, по величини датотеке"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Растуће, по дужини нумере"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Опадајуће, по дужини нумере"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Растуће, по битском протоку"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Опадајуће, по битском протоку"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Растуће по учестаности тока"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Опадајуће, по учестаности тока"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Отвори датотеку(е) са..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Изабери све датотеке"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Отпусти све датотеке"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Обрнуто изабери датотеке"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Уклони датотеку(е)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "П_рва датотека"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Прва датотека"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Пр_етходна датотека"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Претходна датотека"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Наредна датотека"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Наредна датотека"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "По_следња датотека"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Последња датотека"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "С_кенирај датотеку(е)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Скенирај датотеку(е)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Уклони ознаку(е)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Уклони ознаку(е)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Опозови последње измене датотеке(а)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Опозови последње измене датотеке(а)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Понови последње измене датотеке(а)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Понови последње измене датотеке(а)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Сачувај датотеку(е)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Сачувај датотеку(е)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "При_морај чување датотеке(а)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Приморај чување датотеке(а)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Опозови последње измене"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Понови последње измене"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Изађи"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "П_регледач"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Иди у _лични директоријум"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Иди у лични директоријум"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Иди у подразумевани директоријум"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Иди у лични директоријум"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Иди у лични директоријум"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Иди у лични директоријум"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Иди у по_дразумевани директоријум"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Иди у подразумевани директоријум"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Постави _тренутну путању као подразумевану"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Постави тренутну путању као подразумевану"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Преглед у стаблу | Преглед Извођач-Албум"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Преименуј директоријум..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Освежи директоријум"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Отвори директоријум са..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Сакупи стабло"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Освежи стабло"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "С_кенер"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Испуни ознаку(е)"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Испуни ознаку(е)"
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "П_реименуј датотеку(е) у директоријум..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Преименуј датотеку(е) и директоријум"
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Обради поље(а)..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Обради поље(а)..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Остало"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "_Тражи датотеку(е)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Тражи датотеку(е)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Претрага _базе ЦД података..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "ЦД база, тражи..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Учитај имена датотека из .txt датотеке..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Начини листу нумера..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Покрени програм за репродукцију звука"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "Поде_шавања"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Поставке..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Поставке..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_О програму"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Прекини тренутни задатак"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Операције над датотекама"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Нађи датотеку(е) у ЦД бази..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Очисти дневник измена"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Претражуј _под-директоријуме"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Прикажи скривене директоријуме"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Прикажи стабло датотека / Прикажи извођача и албум"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Не могу да спојим UI, грешка: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Све је спремно за почетак..."
 
@@ -744,7 +756,7 @@ msgid "New default path for files selected"
 msgstr "Изабрана је нова подразумевана путања за датотеке"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Потврди..."
 
@@ -756,87 +768,92 @@ msgstr ""
 "Неке датотеке су измењене, али нису сачуване...\n"
 "Да ли желите да их сачувате пре промене директоријума?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Сви албуми>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Грешка: При тражењу %s, не могу да нађем чвор %s у стаблу."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Стабло"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Име датотеке"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Наслов"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Извођач"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Албум"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Година"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Нумера"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Ориг. извођач"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Ауторско право"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "УРЛ"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Кодирано помоћу"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "#Албуми"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "#Датотеке"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Иди у родитељски директоријум"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Унеси директоријум за претрагу."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Изабери директоријум за преглед!"
@@ -844,33 +861,33 @@ msgstr "Изабери директоријум за преглед!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u датотека(е)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Извођач и албум"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Преименуј директоријум"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Користи маску:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Уколик је активно, користиће маске за преименовање директоријума."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -878,31 +895,31 @@ msgstr ""
 "Изабери или упиши маску у облику кодова (види легенду у прозору скенера) за "
 "преименовање директоријума из поља ознака."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Неисправна маска скенера"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Преглед преименовања директоријума..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Грешка..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Морате да унесете име директоријума!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -936,7 +953,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -945,7 +962,7 @@ msgstr ""
 "Не могу да преименујем јер директоријум са тим именом већ постоји!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -960,87 +977,87 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Директоријум преименован"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Програм за покретање:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Унесите програм за покретање. Он ће добити тренутни директоријум као "
 "параметар."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Отвори датотеку са..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Унесите програм за покретање. Он ће добити означену датотеку као параметар."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Морате унети име програма!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Програм „%s“ није нађен!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Не могу да покренем %s (грешка %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Не могу да разгранам у још један процес!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Извршена команда : „%s %s“"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Извођач / Албум"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Категорија"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Наслов нумере"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Време"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Претрага базе ЦД података"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Аутоматска претрага"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "Затражи ЦД базу :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1048,16 +1065,16 @@ msgstr ""
 "Претражује аутоматски ЦД базу користећи изабране датотеке (редослед је "
 "важан!) да би начинио ЦД идентификациони код."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Прекини претрагу..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Користи локалну ЦД базу"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1068,138 +1085,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Ручна претрага"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Речи :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Унеси речи за претрагу (раздвојене размаком или знаком „+“)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Тражи у :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Сва поља"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Остало"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Све категорије"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Блуз"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Класика"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Кантри"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Голк"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Џез"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Остало"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Нови талас"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Реге"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Рок"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Звучна трака"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "укључује : фанк, соул, реп, поп, индастриал, метал,..."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "филмови, кабаре"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "остало што се не уклапа у горе наведене категорије"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Категорије"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Резултати :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Тражи :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Упишите кључне речи за претрагу у листи поред"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Тражи следеће"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Тражи претходно"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Прикажи само црвене редове (или прикажи све линије) у “извођач/албум“ листи"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Отпусти све редове"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Обрнуто изабери редове"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Изабери све редове"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1212,36 +1229,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Унеси у :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Све"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Нумера #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Нумере"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Примени текући скенер за сваку датотеку."
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Поклопи редове Левенштајновим алгоритмом"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1255,16 +1272,16 @@ msgstr ""
 "Ово ће бити коришћено када изаберете одговарајућу аудио датотеку или "
 "примените резултате из ЦД базе података, уместо да директно користи редослед."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Учитај изабране редове или све редове (уколико ни једна није изабрана)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Спремно за претрагу..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1272,76 +1289,80 @@ msgstr ""
 "Албум: '%s', извођач: '%s', дужина нумере: '%s', година: '%s', жанр: '%s', "
 "ИД: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Изабери обратно"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Сортирај по броју нумере"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Сортирај по имену нумере"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Приступам серверу „%s“ ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Не могу да приступим серверу „%s“ (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Не могу да направим нову утичницу (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Повезивање на сервер „%s“, порт „%d“ ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Не могу да се повежем са сервером „%s“ (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Успостављена веза са сервером „%s“"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Преносим податке (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Грешка при читању одговора из ЦД базе (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не могу да направим датотеку „%s“ (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Не могу да отворим датотеку „%s“ (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Шаљем захтев ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Не могу да пошаљем захтев (%s)!"
@@ -1350,62 +1371,63 @@ msgstr "Не могу да пошаљем захтев (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Примам податке ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Сервер је вратио погрешан одговор!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сервер је вратио погрешан одговор! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Нажалост, веб базирана претрага је тренутно онеспособљена!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Нађен(о) %d албум(а) са поклапањем"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Примам податке странице %d (албум %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Примам податке странице %d ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Још резултата да учитам..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Није изабрана датотека!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Више од 99 датотека је изабрано! Не могу да пошаљем захтев!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%d датотека изабрана"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Локална претрага ЦД-а..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 #, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
@@ -1414,28 +1436,28 @@ msgstr ""
 "Путања до „локалне ЦД базе“ није дефинисана!\n"
 "Унесите је у прозору са поставкама."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Шаљем захтев (ЦД база: %s, #нумере: %d, дужина диска: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Нађено %d албум(а) са поклапањем за диск ИД „%s“"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Не могу да учитам датотеку: „%s“ (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Читам листу нумера албума..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1448,7 +1470,7 @@ msgstr ""
 "\n"
 "Да ли желите да наставите?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Упиши ознаке из ЦД базе..."
 
@@ -1707,7 +1729,7 @@ msgstr "Непознати параметар у стази „%s“\n"
 msgid "Browser"
 msgstr "Прегледач"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Датотека"
 
@@ -1721,11 +1743,11 @@ msgstr "Веза са датотеком прекинута"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?. Слој ?"
 
@@ -1733,7 +1755,7 @@ msgstr "?. Слој ?"
 msgid "Bitrate:"
 msgstr "Битски проток:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1741,17 +1763,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Учестаност:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Мод:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1768,7 +1790,7 @@ msgid "Time:"
 msgstr "Време:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Ознака"
 
@@ -1797,45 +1819,56 @@ msgstr "Извођач:"
 msgid "Tag selected files with this artist"
 msgstr "Додај ознаку извођач обележеним датотекама"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Извођач:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Додај ознаку извођач обележеним датотекама"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Албум:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Додај ознаку албум обележеним датотекама"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "ЦД:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Додај ознаку број ЦД-а обележеним датотекама"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Година:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Додај ознаку година обележеним датотекама"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Број доследно изабраних нумера. Почиње од 01 у сваком под-директоријуму."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Нумера #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1843,287 +1876,296 @@ msgstr ""
 "Унеси број датотека, у истом директоријуму као и приказана датотека, да би "
 "изабрао нумере."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Додај ознаку број нумера обележеним датотекама"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Жанр:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Додај ознаку жанр обележеним датотекама"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Додај ознаку коментар обележеним датотекама"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Композитор:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Додај ознаку композитор обележеним датотекама"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Ориг. извођач:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Додај ознаку оригинални извођач обележеним датотекама"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Ауторско право:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Додај ознаку ауторско право обележеним датотекама"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "УРЛ:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Додај ознаку УРЛ обележеним датотекама"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Кодирано помоћу:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Додај ознаку за програм којим су кодиране обележене датотекама"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Слике"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Слике:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Можете превући слике у овај дијалог да би их додали."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Додај слике обележеним датотекама"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Додај слике у ознаку (превлачење је такође доступно)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Уклони изабране слике, у супротном све слике."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Сачувај изабране слике на тврди диск."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Постави атрибуте изабраних слика."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Изабране датотеке означене насловом „%s“."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Уклоњен наслов из изабраних датотека."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Изабране датотеке означене извођачем „%s“."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Уклоњен извођача из изабраних датотека."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Изабране датотеке означене извођачем „%s“."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Уклоњен извођача из изабраних датотека."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Изабране датотеке означене албумом „%s“."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Уклоњено име албума из изабраних датотека."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Изабране датотеке означене бројем диска „%s“."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Уклоњен број диска из изабраних датотека."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Изабране датотеке означене годином „%s“."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Уклоњена година из изабраних датотека."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Изабране датотеке означене називом типа „xx/%s“."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Изабране датотеке означене називом типа „xx“."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Уклоњен број нумере из изабраних датотека."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Изабране датотеке побројане редом."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Изабране датотеке означене жанром „%s“."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Уклоњен жанр из изабраних датотека."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Изабране датотеке означене коментаром „%s“."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Уклоњен коментар из изабраних датотека."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Изабране датотеке означене композитором „%s“."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Уклоњен композитор из изабраних датотека."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Изабране датотеке означене са оригиналним извођачем „%s“."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Уклоњен оригинални извођач из изабраних датотека."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Изабране датотеке означене ауторским правом „%s“."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Уклоњено ауторско право из изабраних датотека."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Изабране датотеке означене УРЛ-ом „%s“."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Уклоњен УРЛ из изабраних датотека."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Изабране датотеке означене са именом кодера „%s“."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Уклоњено име кодера из изабраних датотека."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Изабране датотеке означене сликама."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Уклоњене слике из изабраних датотека."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Изабрани мод и маска, и понови су исте команде."
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Све ознаке су скениране"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Све ознаке су уклоњене"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Тражи датотеку(е)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Све датотеке су сачуване..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Датотеке су половично уклоњене..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Све датотеке су уклоњене..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2132,16 +2174,16 @@ msgstr ""
 "Да ли желите да упишете ознаку датотеке\n"
 "„%s“ ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Упиши ознаку..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Преименуј датотеку и директоријум..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2155,11 +2197,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Преименуј директоријум..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2173,11 +2215,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Преименуј датотеку..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2190,17 +2232,17 @@ msgstr ""
 "у \n"
 "„%s“ ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Уписивање ознаке од „%s“"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Ознака(е) уписане"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2209,21 +2251,21 @@ msgstr ""
 "Не могу да упишем ознаку у датотеку „%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Не могу да упишем ознаку у датотеку „%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Преименујем датотеку „%s“"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2236,7 +2278,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2245,11 +2287,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Датотека(е) нису преименоване..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2262,7 +2304,7 @@ msgstr ""
 "јер следећа већ постоји:\n"
 "„%s“"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2271,7 +2313,7 @@ msgstr ""
 "јер следећа већ постоји:\n"
 "„%s“"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2282,7 +2324,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2291,16 +2333,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Преименована датотека „%s“ у „%s“"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Датотека(е) преименоване..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2311,7 +2353,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2320,17 +2362,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Премештена датотека „%s“ to „%s“"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Датотека(е) премештене..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2343,7 +2385,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2352,11 +2394,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Датотека(е) нисо премештене..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2365,16 +2407,16 @@ msgstr ""
 "Да ли заиста желите да уклоните датотеку\n"
 "„%s“ ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Уклони датотеку..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Датотека „%s“ уклођена"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2386,110 +2428,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Претрага у току..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Датотека: „%s“"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Нађено %d датотека(е) у овом директоријуму и под-директоријумима."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Нађено %d датотека(е) у овом директоријуму."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u датотека(е)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "Ни једна датотека није пронађена у овом директоријуму и под-директоријумима!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Ни једна датотека није пронађена у овом директоријуму!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Тражим..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "Прекини претрагу..."
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Изабери директоријум за преглед!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Означи изабране датотеке овим пољем"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Преведи „_“ и „%20“ у размак"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Преведи „ “ у „_“"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Сва слова велика"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Сва слова мала"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Прво слово велико"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Прво слово сваке речи велико"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Уклони размаке"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Убаци размак пре велико слова"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Уклони дупле размаке или доње цртице"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Ненормално изашао! (ПИД: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Добијен сигнал %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2499,11 +2540,11 @@ msgstr ""
 "извештај грешке са gdb повратни ход („gdb easytag core“ затим „bt“ и „l“) и "
 "информацијама како се грешка може изазвати на easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Непознат сигнал"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2537,11 +2578,11 @@ msgstr ""
 "путања_до/датотека     Користи релативну путању.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Нормалан излаз."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2549,82 +2590,82 @@ msgstr ""
 "Неке датотеке су измењене али нису сачуване...\n"
 "Желите ли да их сачувате пре изласка из програма?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "Да ли заиста желите да изађете из програма?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 ознака"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis ознака"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis ознака"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE ознака"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC ознака"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack ознака"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 датотека"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 даотека"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis датотека"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex датотека"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC датотека"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack датотека"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey аудио датотека"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC датотека"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack датеотека"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Слике (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2632,14 +2673,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2650,11 +2691,11 @@ msgstr ""
 "у кодирање потребно за систем датотека\n"
 "(Покушајте да наместите променљиву G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Преводи имена датотеке"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Име датотеке „%s“ премашује %d карактера и биће скраћено!\n"
@@ -2678,54 +2719,54 @@ msgstr "Кодер:"
 msgid "Channels:"
 msgstr "Канала:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "Грешка при отварању датотеке: „%s“ као FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "Грешка: неуспео упис коментара у датотеку „%s“ (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Уписана ознаку у „%s“"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Уклоњена ознака из „%s“"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Грешка при уклањању ID3v1 ознаке из „%s“ (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при уклањању ID3v2 ознаке из „%s“ (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при промени ID3v2 ознаке у „%s“ (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2750,77 +2791,77 @@ msgstr ""
 "\n"
 "Датотека : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Грешка при промени ID3v1 ознаке у „%s“ (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Ознака у „%s“ промењена"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Нису пријављене грешке"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Немате доступну меморију"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Нема података за обраду"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Неисправно форматирани подаци"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Нема бафера за упис"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Бафер је сувише мало"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Неисправан ИД оквира"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Затражено поље није нађено"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Непознат тип поља"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Ознака је већ додана датотеци"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Неисправна верзија ознаке"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Нема датотеке за обраду"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Покушавам са упишем у датотеку без дозвола за упис"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Грешка при компресији/декомпресији"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Непозната порука о грешци!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2829,7 +2870,7 @@ msgstr ""
 "Следећа оштећена датотека: „%s“\n"
 "ће проузроковати грешку у id3lib, па неће бити обрађена од стране програма."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Оштећена датотека"
 
@@ -2837,74 +2878,74 @@ msgstr "Оштећена датотека"
 msgid "Log"
 msgstr "Дневник измена"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Одабери датотеку..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Одабери директоријум..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Упозорење..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Није дефинисан програм за репродукцију звука!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Не могу да покренем %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Начини листу нумера"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Име M3U листе нумера"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Користи име директоријума"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Уреди маске"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Опције листе нумера"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Укључи само изабране датотеке"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2912,53 +2953,53 @@ msgstr ""
 "Уколико је активирано, само изабране датотеке ће бити уписане у листу "
 "нумера. У супротном, све датотеке ће бити уписане."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Користи пуне путање за датотеке у листи нумера"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Користи релативне путање за датотеке у листи нумера"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Начини листу нумера у родитељском директоријуму"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Уколико је активирано, листа ће бити начињена у родитељском директоријуму."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Користи ДОС-ов раздвајач датотека"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Ова опција мења УНИКС-ов раздвајач датотека „/“ у ДОС-ов раздвајач „\\“."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Садржај листе нумера"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Упиши само листу датотека"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Упиши информације користећи име датотеке"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Упиши информације користећи :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2967,12 +3008,12 @@ msgstr ""
 "Датотека са листом нумера „%s“ већ постоји!\n"
 "Да је препишем?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Уписујем листу нумера..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2981,24 +3022,24 @@ msgstr ""
 "Не могу да упишем листу нумера „%s“!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Листа нумера „%s“ је начињена"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "ЦД"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Кодирано помоћу"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Нађи датотеку"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3006,93 +3047,93 @@ msgstr ""
 "датотека."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "У :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "име датотеке"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "ознака"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Разликуј велика и мала лова"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Нађена(о) : %d датотека(е)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Учитај имена датотека из текстуалног фајла"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Датотека :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr "Учитај"
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Потврди преименовање датотеке"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Уметни размак пре великог слова"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Уклони овај ред"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Уклони све празне редове"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Укључи само изабране датотеке"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Укључи само изабране датотеке"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Освежи"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Упиши само листу датотека"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Изабери све редове"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3100,20 +3141,20 @@ msgstr ""
 "Активирањем ове опције, након учитавања имена датотека, тренутно изабрани "
 "скенер ће бити покренут (прозор скенера мора бити отворено)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Унеси празан ред"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Уклони овај ред"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Помери маску нагоре"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Помери маску надоле"
@@ -3198,12 +3239,12 @@ msgstr ""
 "Ogg Vorbis: Унутарња логичка грешка, указује на грешку у програму или гомилу "
 "оштећења (датотека: „%s“)."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "Грешка: Неуспело отварање датотеке: „%s“ као vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Упозорење : Ogg Vorbis датотека „%s“ садржи ID3v2 ознаку."
@@ -3816,7 +3857,7 @@ msgstr ""
 "Приморај коришћење системског кодирања карактера и активирај превођење "
 "знакова"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3832,7 +3873,7 @@ msgid ""
 msgstr ""
 "Приморај коришћење системског кодирања карактера и занемари неке карактере"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3989,22 +4030,33 @@ msgstr "Користи паковање"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Користи паковање у ID3v2 ознакама."
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Сет карактера за упис ID3 ознака."
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2 ознаке"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Упиши ID3v2 ознаке"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -4013,11 +4065,11 @@ msgstr ""
 "почетку сваке MP3 датотеке. У супротном ће бити уклоњена."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Верзија:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4029,34 +4081,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Сет карактера:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Уникод"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Тип Уникода који да користим."
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Сет карактера коришћен за упис ознака у датотеци."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Додатне поставке за iconv():"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Не"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4066,25 +4118,25 @@ msgstr ""
 "Са овом опцијом, када карактер не може бити представљен жељеним сетом "
 "карактера, биће преведен у неки од њему сличних карактера."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "Преведи"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "Игнориши"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1 ознаке"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Упиши ID3v1.x ознаку"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4092,28 +4144,28 @@ msgstr ""
 "Уколико је активирано, ID3v1 ознака ће бити додата или промењена на крају "
 "MP3 датотека. У супротном ће бити уклоњена."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Сет карактера за упис ID3v1 ознака у датотеци."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Сет карактера за читање ID3 ознака."
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Нестандардно:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4126,8 +4178,8 @@ msgstr ""
 "ознаке).\n"
 "\n"
 "На пример :\n"
-" - у претходним верзијама EasyTAG-а могли сте сачувати UTF-8 карактер у ISO-"
-"8859-1 пољу. Ово није било исправно! Да би превели ове ознаке у Уникод "
+" - у претходним верзијама EasyTAG-а могли сте сачувати UTF-8 карактер у "
+"ISO-8859-1 пољу. Ово није било исправно! Да би превели ове ознаке у Уникод "
 "активирајте ову опцију и изаберите UTF-8. Такође морате активирати опцију "
 "изнад „Покушај да сачуваш ознаке у ISO-8859-1. Уколико није могуће, користи "
 "Уникод (препоручљиво)“ или „Увек сачувај ознаке у Уникод сет карактера“.\n"
@@ -4135,31 +4187,31 @@ msgstr ""
 "читање ознака уписаних под Windows-ом, или „KOI8-R“ за читање ознака "
 "уписаним под Уникс системима."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Сет карактера коришћен при читању ознака у датотекама."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Скенер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Скенер за попуњавање ознаке - превођење карактера"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Преведи доње цртице „_“ и карактер „%20“ у размак „ “"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Преведи размак „ “ у дољу цртицу „_“"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4168,11 +4220,11 @@ msgstr ""
 "из скенера или ознака."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Скенер за промену имена датотекама - превођење карактера"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4181,17 +4233,17 @@ msgstr ""
 "из скенера или имена датотека."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Скенер за обраду поља - превођење карактера"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Немој да повећаш прво слово речи за неке предлоге и чланове."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4203,15 +4255,15 @@ msgstr ""
 "велико“ (на пример, добићете „Text in an Entry“ уместо „Text In An Entry“)."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Прозор скенера"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Отвори прозор скенера при покретању програма"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4219,11 +4271,11 @@ msgstr ""
 "Активирање ове опције ће аутоматски отворити прозор скенера при покретању "
 "EasyTAG програма."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Прозор скенера увек на врху"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4232,16 +4284,16 @@ msgstr ""
 "главног прозора."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Поља"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Препиши сва поља при скенирању ознаке"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4249,11 +4301,11 @@ msgstr ""
 "Уколико је активирано, скенер ће заменити постојећи текст у пољима новим. "
 "Уколико није, само празна поља ознака ће бити попуњена."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Постави овај текст као подразумевани коментар:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4262,12 +4314,12 @@ msgstr ""
 "поље коментара при коришћењу „Скенера за попуњавање ознака“"
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Користи CRC32 као подразумевани коментар (само за датотеке са ID3 ознакама)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4278,42 +4330,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "ЦД база података"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Поставке сервера за аутоматску претрагу"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Име :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Порт :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI путања :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Поставке сервера за ручну претрагу"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Локална ЦД баса података"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Путања :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4325,52 +4377,52 @@ msgstr ""
 "„folk“, „jazz“, „newage“, „reggae“, „rock“, „soundtrack“ и „misc“."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Поставке мрежног посредника"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Користи мрежни посредник"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Активира поставке мрежног посредника."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Име посредника :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Име сервера мрежног посредника."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Порт мрежног посредника"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Корисничко име :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Име корисника мрежног посредника."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Лозинка :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Лозинка корисника мрежног посредника."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Листа имена нумера"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4378,7 +4430,7 @@ msgstr ""
 "Изабери одговарајућу аудио датотеку (судећи по месту или ДЛМ-у уколико је "
 "активирано испод)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4387,7 +4439,7 @@ msgstr ""
 "аудио датотека у главној листи ће такође бити изабрана."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4398,72 +4450,76 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Потврде"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Потврди излазак из програма"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 "Уколико је активирано, отвара се окно за потврду пре изласка из програма."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Потврди упис ознаке и датотеку"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Потврди преименовање датотеке"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Потврди брисање датотеке"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Потврди прављење листе нумера"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Примени измене (али немој да их сачуваш) и затвори овај прозор"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Затвори овај прозор без чувања"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Сачува измене и затвори прозор"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример:%.*d_-_Име_нумере_1.mp3 )"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Измене су примењене"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Поставке су сачуване"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Поставке нису мењане"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4473,58 +4529,58 @@ msgstr ""
 "Изабрана путања за подразумевану стазу до датотека није исправна!n„%s“\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Није директоријум"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Програм за репродукцију звука „%s“ није нађен!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Попуни ознаку"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Преименуј датотеку и директоријум"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Обради поља"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Ознака успешно скенирана..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Ознака успешно скенирана... (%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 "Скенер ознака: чудно... екстензија „%s“ није нађена у имену датотеке „%s“!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Грешка скенера: не могу да нађем раздвајач „%s“ у „%s“"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Не могу да преведем име датотеке „%s“ у систем кодирања имена датотеке"
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Ново име датотеке успешно скенирано..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Ново име датотеке успешно скенирано...(%s)"
@@ -4532,41 +4588,41 @@ msgstr "Ново име датотеке успешно скенирано...(%s
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Скенер ознака и имена датотека"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Скенер:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Изабери тип скенера за употребу"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Отвори прозор скенера / Скенирај изабране датотеке"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Опције скенера"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Прикажи / Сакриј уређивач маски"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Прикажи / Сакриј легенду"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Затвори овај прозор"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4575,15 +4631,15 @@ msgstr ""
 "имену датотеке или путањи. Користи се за попуњавање поља ознака."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Преглед попуњавања ознаке..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Маска префикса са тренутном путањом"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4596,15 +4652,15 @@ msgstr ""
 "у супротној је релативна у односу на стару путању."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Преглед преименовања датотеке..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Изабери поља:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4613,126 +4669,136 @@ msgstr ""
 "вам требају."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "Д"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Обради поље за име датотеке."
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "Н"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Обради поље „Наслов“."
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "И"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Обради поље „Извођач“."
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Обради поље „Извођач“."
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "А"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Обради поље „Албум“."
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "Ж"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Обради поље „Жанр“."
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "К"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Обради поље „Коментар“."
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Кп"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Обради поље „Композитор“."
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "О"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Обради поље „Оригинални извођач“."
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Ап"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Обради поље „Ауторско право“."
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "У"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Обради поље „УРЛ“."
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "Кд"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Обради поље „Кодирано поноћу“."
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Изабери обратно"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Изабери све/ништа"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Преведи „_“ и „%20“ у „ “"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Преведи:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "у:"
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4740,7 +4806,7 @@ msgstr ""
 "Доње цртице и карактер „%20“ између речи ће бити замењени размаком. На "
 "пример „Текст%20у%20неком_пољу“ ће постати „Тексту неком пољу“."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4748,16 +4814,16 @@ msgstr ""
 "Размак између речи биће замењен доњом цртицом. На пример „Текст у неком "
 "пољу“ ће постати „Текст_у_неком_пољу“."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4765,7 +4831,7 @@ msgstr ""
 "Све речи у пољима испиши великим словима. На пример „Текст У НЕКОМ пољу“ ће "
 "постати „ТЕКСТ У НЕКОМ ПОЉУ“."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4773,7 +4839,7 @@ msgstr ""
 "Све речи у пољима испиши малим словима. На пример „ТЕКСТ У неком пољу“ ће "
 "постати „текст у неком пољу“."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4781,7 +4847,7 @@ msgstr ""
 "Прво слово сваког поља промени у велико. На пример „текст У Неком ПОЉУ“ ће "
 "постати „Текст у неком пољу“."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4789,7 +4855,7 @@ msgstr ""
 "Свако прво слово речи у пољима промени у велико. На пример „Текст у неком "
 "ПОЉУ“ ће постати „Текст У Неком Пољу“."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4798,15 +4864,15 @@ msgstr ""
 "Додаје размак пре сваког великог слова. На пример „ТекстУНекомПољу“ ће "
 "постати „Текст У Неком Пољу“."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Уметни размак пре великог слова"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Уклони дупле размаке или доње цртице"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4814,7 +4880,7 @@ msgstr ""
 "Уклања све размаке између речи. На пример „Текст У Неком Пољу“ ће постати "
 "„ТекстУНекомПољу“."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4822,7 +4888,7 @@ msgstr ""
 "Додаје размак пре сваког великог слова. На пример „ТекстУНекомПољу“ ће "
 "постати „Текст У Неком Пољу“."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4833,183 +4899,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Легенда"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : извођач"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : извођач"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : албум"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : коментар"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : композитор"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : ауторско право"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : број ЦД-а"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : кодирано помоћу"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : жанр"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : игнорисано"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : број нумера"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ориг. ивођач"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : нумера"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : наслов"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : УРЛ"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : година"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Уређивач маски"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Направи нову маску"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Помери маску нагоре"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Помери маску надоле"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Размножи маску"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Додај подразумевану маску"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Уклони маску"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Сачувај маску"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Нова _маска"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Умножи: Није изабран ред!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Уклони: Није изабран ред!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Помери нагоре: Није изабран ред!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Помери надоле: Није изабран ред!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "Грешка: Не могу да упишем датотеку са поставкама: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не могу да отворим датотеку са поставкама „%s“ (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Учитавам подразумеване поставке..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не могу да направим или отворим датотеку „%s“ (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "Грешка: Не могу да упишем листу у датотеку: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Учитавам подразумеване маске за „Попуни ознаку“..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Учитавам подразумеване маске за „Преименуј датотеку“..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Учитавам подразумеване маске за „Преименуј директоријум“..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "Грешка: Промењљива окружења „HOME“ није одређена!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "Грешка: Не могу да направим директоријум „%s“ (%s)!"
diff --git a/po/sr at Latn.gmo b/po/sr at Latn.gmo
index 9e896fd..edd45e8 100644
Binary files a/po/sr at Latn.gmo and b/po/sr at Latn.gmo differ
diff --git a/po/sr at Latn.po b/po/sr at Latn.po
index 454f69a..debb016 100644
--- a/po/sr at Latn.po
+++ b/po/sr at Latn.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG-2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-09-04 09:53+0100\n"
 "Last-Translator: Miloš Popović <gpopac at gmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Serbian\n"
 "X-Poedit-Country: SERBIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -31,6 +32,7 @@ msgstr ""
 "lepo GTK+ okruženje čini označavanje u GNU/Linuksu sistemima lakšim."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Nemački prevod)"
 
@@ -112,111 +114,111 @@ msgstr "(Hebrejski prevod)"
 msgid "(Serbian translation)"
 msgstr "(Nemački prevod)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Komentar"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "O programu..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "O programu"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Preveo: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(Koristi: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "Mejl adresa: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Internet stranica: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Opis:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Podrška za MP3 datoteke je isključena)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(ID3v2.3 oznake su isključene)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "Nemate dostupnu memoriju"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Podrška za Ogg Vorbis datoteke je isključena)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Podrška za Speex datoteke je isključena)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Podrška za FLAC datoteke je isključena)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Podrška za MP4/AAC datoteke je isključena)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Podrška za WavPack datoteke je isključena)"
@@ -224,33 +226,33 @@ msgstr "(Podrška za WavPack datoteke je isključena)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Zahvalnost"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Prevodi:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Opšte:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Promene"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Ne mogu da otvorim datoteku „%s“ (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Greška pri otvaranju datoteke: „%s“ (%s)."
@@ -258,484 +260,494 @@ msgstr "Greška pri otvaranju datoteke: „%s“ (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Datoteka"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Sortiraj listu po oznaci"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Sortiraj listu po svojstvu datoteke"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Rastuće, po imenu datoteke"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Opadajuće, po imenu datoteke"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Rastuće, po datumu nastanka"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Opadajuće, po datumu nastanka"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Rastuće, po broju numere"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Opadajuće, po broju numere"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Rastuće, po naslovu"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Opadajuće, po naslovu"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Rastuće, po izvođaču"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Opadajuće, po izvođaču"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Rastuće, po izvođaču"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Opadajuće, po izvođaču"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Rastuće, po albumu"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Opadajuće, po albumu"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Rastuće, po godini"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Opadajuće, po godini"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Rastuće, po žanru"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Opadajuće, po žanru"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Rastuće, po komentaru"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Opadajuće, po komentaru"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Rastuće, po kompozitoru"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Opadajuće, po kompozitoru"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Rastuće, po originalnom izvođaču"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Opadajuće, po originalnom izvođaču"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Rastuće, po autorskim pravima"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Opadajuće, po autorskim pravima"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Rastuće, po URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Opadajuće, po URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Rastuće, po imenu kodera"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Opadajuće, po imenu kodera"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Rastuće, po tipu datoteke"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Opadajuće, po tipu datoteke"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Rastuće, po veličini datoteke"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Opadajuće, po veličini datoteke"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Rastuće, po dužini numere"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Opadajuće, po dužini numere"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Rastuće, po bitskom protoku"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Opadajuće, po bitskom protoku"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Rastuće po učestanosti toka"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Opadajuće, po učestanosti toka"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Otvori datoteku(e) sa..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Izaberi sve datoteke"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Otpusti sve datoteke"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Obrnuto izaberi datoteke"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Ukloni datoteku(e)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "P_rva datoteka"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Prva datoteka"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "Pr_ethodna datoteka"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Prethodna datoteka"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Naredna datoteka"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Naredna datoteka"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "Po_slednja datoteka"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Poslednja datoteka"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "S_keniraj datoteku(e)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Skeniraj datoteku(e)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Ukloni oznaku(e)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Ukloni oznaku(e)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Opozovi poslednje izmene datoteke(a)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Opozovi poslednje izmene datoteke(a)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Ponovi poslednje izmene datoteke(a)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Ponovi poslednje izmene datoteke(a)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Sačuvaj datoteku(e)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Sačuvaj datoteku(e)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "Pri_moraj čuvanje datoteke(a)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Primoraj čuvanje datoteke(a)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Opozovi poslednje izmene"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Ponovi poslednje izmene"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Izađi"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "P_regledač"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "Idi u _lični direktorijum"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "Idi u lični direktorijum"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Idi u podrazumevani direktorijum"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "Idi u lični direktorijum"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "Idi u lični direktorijum"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "Idi u lični direktorijum"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Idi u po_drazumevani direktorijum"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Idi u podrazumevani direktorijum"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Postavi _trenutnu putanju kao podrazumevanu"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Postavi trenutnu putanju kao podrazumevanu"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Pregled u stablu | Pregled Izvođač-Album"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Preimenuj direktorijum..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Osveži direktorijum"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Otvori direktorijum sa..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Sakupi stablo"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Osveži stablo"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "S_kener"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Ispuni oznaku(e)"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Ispuni oznaku(e)"
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "P_reimenuj datoteku(e) u direktorijum..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Preimenuj datoteku(e) i direktorijum"
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Obradi polje(a)..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Obradi polje(a)..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Ostalo"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "_Traži datoteku(e)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Traži datoteku(e)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Pretraga _baze CD podataka..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CD baza, traži..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Učitaj imena datoteka iz .txt datoteke..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Načini listu numera..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Pokreni program za reprodukciju zvuka"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "Pode_Å¡avanja"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Postavke..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Postavke..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_O programu"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Prekini trenutni zadatak"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Operacije nad datotekama"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "Nađi datoteku(e) u CD bazi..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Očisti dnevnik izmena"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Pretražuj _pod-direktorijume"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Prikaži skrivene direktorijume"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Prikaži stablo datoteka / Prikaži izvođača i album"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Ne mogu da spojim UI, greška: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Sve je spremno za početak..."
 
@@ -744,7 +756,7 @@ msgid "New default path for files selected"
 msgstr "Izabrana je nova podrazumevana putanja za datoteke"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Potvrdi..."
 
@@ -756,87 +768,92 @@ msgstr ""
 "Neke datoteke su izmenjene, ali nisu sačuvane...\n"
 "Da li želite da ih sačuvate pre promene direktorijuma?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Svi albumi>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Greška: Pri traženju %s, ne mogu da nađem čvor %s u stablu."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Stablo"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Naslov"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Izvođač"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Izvođač"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Godina"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Numera"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Žanr"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Kompozitor"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Orig. izvođač"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Autorsko pravo"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "Kodirano pomoću"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "#Albumi"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "#Datoteke"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "Idi u roditeljski direktorijum"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Unesi direktorijum za pretragu."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "Izaberi direktorijum za pregled!"
@@ -844,33 +861,33 @@ msgstr "Izaberi direktorijum za pregled!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u datoteka(e)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Izvođač i album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Preimenuj direktorijum"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Koristi masku:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ukolik je aktivno, koristiće maske za preimenovanje direktorijuma."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -878,31 +895,31 @@ msgstr ""
 "Izaberi ili upiši masku u obliku kodova (vidi legendu u prozoru skenera) za "
 "preimenovanje direktorijuma iz polja oznaka."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Neispravna maska skenera"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Pregled preimenovanja direktorijuma..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Greška..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Morate da unesete ime direktorijuma!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -936,7 +953,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -945,7 +962,7 @@ msgstr ""
 "Ne mogu da preimenujem jer direktorijum sa tim imenom već postoji!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -960,87 +977,87 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Direktorijum preimenovan"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Program za pokretanje:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Unesite program za pokretanje. On će dobiti trenutni direktorijum kao "
 "parametar."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Otvori datoteku sa..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Unesite program za pokretanje. On će dobiti označenu datoteku kao parametar."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Morate uneti ime programa!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Program „%s“ nije nađen!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Ne mogu da pokrenem %s (greška %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Ne mogu da razgranam u još jedan proces!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Izvršena komanda : „%s %s“"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Izvođač / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Kategorija"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Naslov numere"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Vreme"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "Pretraga baze CD podataka"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatska pretraga"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "Zatraži CD bazu :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1048,16 +1065,16 @@ msgstr ""
 "Pretražuje automatski CD bazu koristeći izabrane datoteke (redosled je "
 "važan!) da bi načinio CD identifikacioni kod."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Prekini pretragu..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Koristi lokalnu CD bazu"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1068,138 +1085,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Ručna pretraga"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Reči :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Unesi reči za pretragu (razdvojene razmakom ili znakom „+“)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Traži u :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Sva polja"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Ostalo"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Sve kategorije"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Bluz"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klasika"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Kantri"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Golk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Džez"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Ostalo"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Novi talas"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Rege"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rok"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Zvučna traka"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "uključuje : fank, soul, rep, pop, indastrial, metal,..."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "filmovi, kabare"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "ostalo Å¡to se ne uklapa u gore navedene kategorije"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Kategorije"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Rezultati :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Traži :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Upišite ključne reči za pretragu u listi pored"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Traži sledeće"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Traži prethodno"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Prikaži samo crvene redove (ili prikaži sve linije) u “izvođač/album“ listi"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Otpusti sve redove"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Obrnuto izaberi redove"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Izaberi sve redove"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1213,36 +1230,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Unesi u :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Sve"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Numera #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# Numere"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Primeni tekući skener za svaku datoteku."
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Poklopi redove Levenštajnovim algoritmom"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1257,16 +1274,16 @@ msgstr ""
 "ili primenite rezultate iz CD baze podataka, umesto da direktno koristi "
 "redosled."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Učitaj izabrane redove ili sve redove (ukoliko ni jedna nije izabrana)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Spremno za pretragu..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1274,76 +1291,80 @@ msgstr ""
 "Album: '%s', izvođač: '%s', dužina numere: '%s', godina: '%s', žanr: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Izaberi obratno"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Sortiraj po broju numere"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Sortiraj po imenu numere"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Pristupam serveru „%s“ ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Ne mogu da pristupim serveru „%s“ (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Ne mogu da napravim novu utičnicu (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Povezivanje na server „%s“, port „%d“ ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Ne mogu da se povežem sa serverom „%s“ (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Uspostavljena veza sa serverom „%s“"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Prenosim podatke (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Greška pri čitanju odgovora iz CD baze (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Ne mogu da napravim datoteku „%s“ (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Ne mogu da otvorim datoteku „%s“ (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Å aljem zahtev ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Ne mogu da pošaljem zahtev (%s)!"
@@ -1352,62 +1373,63 @@ msgstr "Ne mogu da pošaljem zahtev (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Primam podatke ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Server je vratio pogrešan odgovor!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Server je vratio pogrešan odgovor! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Nažalost, veb bazirana pretraga je trenutno onesposobljena!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Nađen(o) %d album(a) sa poklapanjem"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Primam podatke stranice %d (album %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Primam podatke stranice %d ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Još rezultata da učitam..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Nije izabrana datoteka!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Više od 99 datoteka je izabrano! Ne mogu da pošaljem zahtev!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%d datoteka izabrana"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Lokalna pretraga CD-a..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 #, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
@@ -1416,28 +1438,28 @@ msgstr ""
 "Putanja do „lokalne CD baze“ nije definisana!\n"
 "Unesite je u prozoru sa postavkama."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Šaljem zahtev (CD baza: %s, #numere: %d, dužina diska: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Nađeno %d album(a) sa poklapanjem za disk ID „%s“"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Ne mogu da učitam datoteku: „%s“ (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "ÄŒitam listu numera albuma..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1450,7 +1472,7 @@ msgstr ""
 "\n"
 "Da li želite da nastavite?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Upiši oznake iz CD baze..."
 
@@ -1709,7 +1731,7 @@ msgstr "Nepoznati parametar u stazi „%s“\n"
 msgid "Browser"
 msgstr "Pregledač"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Datoteka"
 
@@ -1723,11 +1745,11 @@ msgstr "Veza sa datotekom prekinuta"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?. Sloj ?"
 
@@ -1735,7 +1757,7 @@ msgstr "?. Sloj ?"
 msgid "Bitrate:"
 msgstr "Bitski protok:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1743,17 +1765,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Učestanost:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mod:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1770,7 +1792,7 @@ msgid "Time:"
 msgstr "Vreme:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Oznaka"
 
@@ -1799,45 +1821,56 @@ msgstr "Izvođač:"
 msgid "Tag selected files with this artist"
 msgstr "Dodaj oznaku izvođač obeleženim datotekama"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Izvođač:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Dodaj oznaku izvođač obeleženim datotekama"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Dodaj oznaku album obeleženim datotekama"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Dodaj oznaku broj CD-a obeleženim datotekama"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Godina:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Dodaj oznaku godina obeleženim datotekama"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Broj dosledno izabranih numera. Počinje od 01 u svakom pod-direktorijumu."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Numera #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1845,287 +1878,296 @@ msgstr ""
 "Unesi broj datoteka, u istom direktorijumu kao i prikazana datoteka, da bi "
 "izabrao numere."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Dodaj oznaku broj numera obeleženim datotekama"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Žanr:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Dodaj oznaku žanr obeleženim datotekama"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Dodaj oznaku komentar obeleženim datotekama"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Kompozitor:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Dodaj oznaku kompozitor obeleženim datotekama"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Orig. izvođač:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Dodaj oznaku originalni izvođač obeleženim datotekama"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Autorsko pravo:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Dodaj oznaku autorsko pravo obeleženim datotekama"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Dodaj oznaku URL obeleženim datotekama"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Kodirano pomoću:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Dodaj oznaku za program kojim su kodirane obeležene datotekama"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Slike"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Slike:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Možete prevući slike u ovaj dijalog da bi ih dodali."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Dodaj slike obeleženim datotekama"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Dodaj slike u oznaku (prevlačenje je takođe dostupno)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Ukloni izabrane slike, u suprotnom sve slike."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Sačuvaj izabrane slike na tvrdi disk."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Postavi atribute izabranih slika."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Izabrane datoteke označene naslovom „%s“."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Uklonjen naslov iz izabranih datoteka."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Izabrane datoteke označene izvođačem „%s“."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Uklonjen izvođača iz izabranih datoteka."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Izabrane datoteke označene izvođačem „%s“."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Uklonjen izvođača iz izabranih datoteka."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Izabrane datoteke označene albumom „%s“."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Uklonjeno ime albuma iz izabranih datoteka."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Izabrane datoteke označene brojem diska „%s“."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Uklonjen broj diska iz izabranih datoteka."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Izabrane datoteke označene godinom „%s“."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Uklonjena godina iz izabranih datoteka."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Izabrane datoteke označene nazivom tipa „xx/%s“."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Izabrane datoteke označene nazivom tipa „xx“."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Uklonjen broj numere iz izabranih datoteka."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Izabrane datoteke pobrojane redom."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Izabrane datoteke označene žanrom „%s“."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Uklonjen žanr iz izabranih datoteka."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Izabrane datoteke označene komentarom „%s“."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Uklonjen komentar iz izabranih datoteka."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Izabrane datoteke označene kompozitorom „%s“."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Uklonjen kompozitor iz izabranih datoteka."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Izabrane datoteke označene sa originalnim izvođačem „%s“."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Uklonjen originalni izvođač iz izabranih datoteka."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Izabrane datoteke označene autorskim pravom „%s“."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Uklonjeno autorsko pravo iz izabranih datoteka."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Izabrane datoteke označene URL-om „%s“."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Uklonjen URL iz izabranih datoteka."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Izabrane datoteke označene sa imenom kodera „%s“."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Uklonjeno ime kodera iz izabranih datoteka."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Izabrane datoteke označene slikama."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Uklonjene slike iz izabranih datoteka."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Izabrani mod i maska, i ponovi su iste komande."
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Sve oznake su skenirane"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Sve oznake su uklonjene"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Traži datoteku(e)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Sve datoteke su sačuvane..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Datoteke su polovično uklonjene..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Sve datoteke su uklonjene..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2134,16 +2176,16 @@ msgstr ""
 "Da li želite da upišete oznaku datoteke\n"
 "„%s“ ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Upiši oznaku..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Preimenuj datoteku i direktorijum..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2157,11 +2199,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Preimenuj direktorijum..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2175,11 +2217,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Preimenuj datoteku..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2192,17 +2234,17 @@ msgstr ""
 "u \n"
 "„%s“ ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Upisivanje oznake od „%s“"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "Oznaka(e) upisane"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2211,21 +2253,21 @@ msgstr ""
 "Ne mogu da upišem oznaku u datoteku „%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Ne mogu da upišem oznaku u datoteku „%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Preimenujem datoteku „%s“"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2238,7 +2280,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2247,11 +2289,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Datoteka(e) nisu preimenovane..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2264,7 +2306,7 @@ msgstr ""
 "jer sledeća već postoji:\n"
 "„%s“"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2273,7 +2315,7 @@ msgstr ""
 "jer sledeća već postoji:\n"
 "„%s“"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2284,7 +2326,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2293,16 +2335,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Preimenovana datoteka „%s“ u „%s“"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Datoteka(e) preimenovane..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2313,7 +2355,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2322,17 +2364,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Premeštena datoteka „%s“ to „%s“"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Datoteka(e) premeštene..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2345,7 +2387,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2354,11 +2396,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Datoteka(e) niso premeštene..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2367,16 +2409,16 @@ msgstr ""
 "Da li zaista želite da uklonite datoteku\n"
 "„%s“ ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Ukloni datoteku..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Datoteka „%s“ uklođena"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2388,110 +2430,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Pretraga u toku..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Datoteka: „%s“"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Nađeno %d datoteka(e) u ovom direktorijumu i pod-direktorijumima."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Nađeno %d datoteka(e) u ovom direktorijumu."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u datoteka(e)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "Ni jedna datoteka nije pronađena u ovom direktorijumu i pod-direktorijumima!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Ni jedna datoteka nije pronađena u ovom direktorijumu!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Tražim..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "Prekini pretragu..."
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Izaberi direktorijum za pregled!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Označi izabrane datoteke ovim poljem"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Prevedi „_“ i „%20“ u razmak"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Prevedi „ “ u „_“"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Sva slova velika"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Sva slova mala"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Prvo slovo veliko"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Prvo slovo svake reči veliko"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Ukloni razmake"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Ubaci razmak pre veliko slova"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Ukloni duple razmake ili donje crtice"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Nenormalno izašao! (PID: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Dobijen signal %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2501,11 +2542,11 @@ msgstr ""
 "izveštaj greške sa gdb povratni hod („gdb easytag core“ zatim „bt“ i „l“) i "
 "informacijama kako se greška može izazvati na easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Nepoznat signal"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2539,11 +2580,11 @@ msgstr ""
 "putanja_do/datoteka     Koristi relativnu putanju.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normalan izlaz."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2551,82 +2592,82 @@ msgstr ""
 "Neke datoteke su izmenjene ali nisu sačuvane...\n"
 "Želite li da ih sačuvate pre izlaska iz programa?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "Da li zaista želite da izađete iz programa?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 oznaka"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis oznaka"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis oznaka"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE oznaka"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC oznaka"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack oznaka"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 datoteka"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 daoteka"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis datoteka"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex datoteka"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC datoteka"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack datoteka"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey audio datoteka"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC datoteka"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack dateoteka"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Slike (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2634,14 +2675,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2652,11 +2693,11 @@ msgstr ""
 "u kodiranje potrebno za sistem datoteka\n"
 "(Pokušajte da namestite promenljivu G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Prevodi imena datoteke"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Ime datoteke „%s“ premašuje %d karaktera i biće skraćeno!\n"
@@ -2680,54 +2721,54 @@ msgstr "Koder:"
 msgid "Channels:"
 msgstr "Kanala:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "Greška pri otvaranju datoteke: „%s“ kao FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "Greška: neuspeo upis komentara u datoteku „%s“ (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Upisana oznaku u „%s“"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Uklonjena oznaka iz „%s“"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Greška pri uklanjanju ID3v1 oznake iz „%s“ (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Greška pri uklanjanju ID3v2 oznake iz „%s“ (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Greška pri promeni ID3v2 oznake u „%s“ (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2752,77 +2793,77 @@ msgstr ""
 "\n"
 "Datoteka : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Greška pri promeni ID3v1 oznake u „%s“ (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Oznaka u „%s“ promenjena"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Nisu prijavljene greške"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Nemate dostupnu memoriju"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Nema podataka za obradu"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Neispravno formatirani podaci"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Nema bafera za upis"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Bafer je suviše malo"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Neispravan ID okvira"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Zatraženo polje nije nađeno"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Nepoznat tip polja"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Oznaka je već dodana datoteci"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Neispravna verzija oznake"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Nema datoteke za obradu"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Pokušavam sa upišem u datoteku bez dozvola za upis"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Greška pri kompresiji/dekompresiji"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Nepoznata poruka o grešci!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2831,7 +2872,7 @@ msgstr ""
 "Sledeća oštećena datoteka: „%s“\n"
 "će prouzrokovati grešku u id3lib, pa neće biti obrađena od strane programa."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Oštećena datoteka"
 
@@ -2839,74 +2880,74 @@ msgstr "Oštećena datoteka"
 msgid "Log"
 msgstr "Dnevnik izmena"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Odaberi datoteku..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Odaberi direktorijum..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Upozorenje..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Nije definisan program za reprodukciju zvuka!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Ne mogu da pokrenem %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Načini listu numera"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Ime M3U liste numera"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Koristi ime direktorijuma"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Uredi maske"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Opcije liste numera"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Uključi samo izabrane datoteke"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2914,53 +2955,53 @@ msgstr ""
 "Ukoliko je aktivirano, samo izabrane datoteke će biti upisane u listu "
 "numera. U suprotnom, sve datoteke će biti upisane."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Koristi pune putanje za datoteke u listi numera"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Koristi relativne putanje za datoteke u listi numera"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Načini listu numera u roditeljskom direktorijumu"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Ukoliko je aktivirano, lista će biti načinjena u roditeljskom direktorijumu."
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Koristi DOS-ov razdvajač datoteka"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Ova opcija menja UNIKS-ov razdvajač datoteka „/“ u DOS-ov razdvajač „\\“."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Sadržaj liste numera"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Upiši samo listu datoteka"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Upiši informacije koristeći ime datoteke"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Upiši informacije koristeći :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2969,12 +3010,12 @@ msgstr ""
 "Datoteka sa listom numera „%s“ već postoji!\n"
 "Da je prepišem?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Upisujem listu numera..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2983,24 +3024,24 @@ msgstr ""
 "Ne mogu da upišem listu numera „%s“!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Lista numera „%s“ je načinjena"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Kodirano pomoću"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Nađi datoteku"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3008,93 +3049,93 @@ msgstr ""
 "datoteka."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "U :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "ime datoteke"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "oznaka"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Razlikuj velika i mala lova"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Nađena(o) : %d datoteka(e)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Učitaj imena datoteka iz tekstualnog fajla"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Datoteka :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr "Učitaj"
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Potvrdi preimenovanje datoteke"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Umetni razmak pre velikog slova"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Ukloni ovaj red"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Ukloni sve prazne redove"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Uključi samo izabrane datoteke"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Uključi samo izabrane datoteke"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Osveži"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "Upiši samo listu datoteka"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "Izaberi sve redove"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3102,20 +3143,20 @@ msgstr ""
 "Aktiviranjem ove opcije, nakon učitavanja imena datoteka, trenutno izabrani "
 "skener će biti pokrenut (prozor skenera mora biti otvoreno)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Unesi prazan red"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Ukloni ovaj red"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "Pomeri masku nagore"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "Pomeri masku nadole"
@@ -3200,12 +3241,12 @@ msgstr ""
 "Ogg Vorbis: Unutarnja logička greška, ukazuje na grešku u programu ili "
 "gomilu oštećenja (datoteka: „%s“)."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "Greška: Neuspelo otvaranje datoteke: „%s“ kao vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Upozorenje : Ogg Vorbis datoteka „%s“ sadrži ID3v2 oznaku."
@@ -3819,7 +3860,7 @@ msgstr ""
 "Primoraj korišćenje sistemskog kodiranja karaktera i aktiviraj prevođenje "
 "znakova"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3835,7 +3876,7 @@ msgid ""
 msgstr ""
 "Primoraj korišćenje sistemskog kodiranja karaktera i zanemari neke karaktere"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3992,22 +4033,33 @@ msgstr "Koristi pakovanje"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Koristi pakovanje u ID3v2 oznakama."
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Set karaktera za upis ID3 oznaka."
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2 oznake"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Upiši ID3v2 oznake"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -4016,11 +4068,11 @@ msgstr ""
 "početku svake MP3 datoteke. U suprotnom će biti uklonjena."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Verzija:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4032,34 +4084,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Set karaktera:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unikod"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Tip Unikoda koji da koristim."
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Set karaktera korišćen za upis oznaka u datoteci."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Dodatne postavke za iconv():"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Ne"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -4069,25 +4121,25 @@ msgstr ""
 "Sa ovom opcijom, kada karakter ne može biti predstavljen željenim setom "
 "karaktera, biće preveden u neki od njemu sličnih karaktera."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "Prevedi"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "Ignoriši"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1 oznake"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Upiši ID3v1.x oznaku"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4095,28 +4147,28 @@ msgstr ""
 "Ukoliko je aktivirano, ID3v1 oznaka će biti dodata ili promenjena na kraju "
 "MP3 datoteka. U suprotnom će biti uklonjena."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Set karaktera za upis ID3v1 oznaka u datoteci."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Set karaktera za čitanje ID3 oznaka."
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Nestandardno:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4129,8 +4181,8 @@ msgstr ""
 "ID3v1 oznake).\n"
 "\n"
 "Na primer :\n"
-" - u prethodnim verzijama EasyTAG-a mogli ste sačuvati UTF-8 karakter u ISO-"
-"8859-1 polju. Ovo nije bilo ispravno! Da bi preveli ove oznake u Unikod "
+" - u prethodnim verzijama EasyTAG-a mogli ste sačuvati UTF-8 karakter u "
+"ISO-8859-1 polju. Ovo nije bilo ispravno! Da bi preveli ove oznake u Unikod "
 "aktivirajte ovu opciju i izaberite UTF-8. Takođe morate aktivirati opciju "
 "iznad „Pokušaj da sačuvaš oznake u ISO-8859-1. Ukoliko nije moguće, koristi "
 "Unikod (preporučljivo)“ ili „Uvek sačuvaj oznake u Unikod set karaktera“.\n"
@@ -4138,31 +4190,31 @@ msgstr ""
 "čitanje oznaka upisanih pod Windows-om, ili „KOI8-R“ za čitanje oznaka "
 "upisanim pod Uniks sistemima."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Set karaktera korišćen pri čitanju oznaka u datotekama."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Skener"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Skener za popunjavanje oznake - prevođenje karaktera"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Prevedi donje crtice „_“ i karakter „%20“ u razmak „ “"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Prevedi razmak „ “ u dolju crticu „_“"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4171,11 +4223,11 @@ msgstr ""
 "maske iz skenera ili oznaka."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Skener za promenu imena datotekama - prevođenje karaktera"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4184,17 +4236,17 @@ msgstr ""
 "maske iz skenera ili imena datoteka."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Skener za obradu polja - prevođenje karaktera"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Nemoj da povećaš prvo slovo reči za neke predloge i članove."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4206,15 +4258,15 @@ msgstr ""
 "veliko“ (na primer, dobićete „Text in an Entry“ umesto „Text In An Entry“)."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Prozor skenera"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Otvori prozor skenera pri pokretanju programa"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4222,11 +4274,11 @@ msgstr ""
 "Aktiviranje ove opcije će automatski otvoriti prozor skenera pri pokretanju "
 "EasyTAG programa."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Prozor skenera uvek na vrhu"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4235,16 +4287,16 @@ msgstr ""
 "glavnog prozora."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Polja"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Prepiši sva polja pri skeniranju oznake"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4252,11 +4304,11 @@ msgstr ""
 "Ukoliko je aktivirano, skener će zameniti postojeći tekst u poljima novim. "
 "Ukoliko nije, samo prazna polja oznaka će biti popunjena."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Postavi ovaj tekst kao podrazumevani komentar:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4265,12 +4317,12 @@ msgstr ""
 "polje komentara pri korišćenju „Skenera za popunjavanje oznaka“"
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Koristi CRC32 kao podrazumevani komentar (samo za datoteke sa ID3 oznakama)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4281,42 +4333,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD baza podataka"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Postavke servera za automatsku pretragu"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Ime :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI putanja :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Postavke servera za ručnu pretragu"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Lokalna CD basa podataka"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Putanja :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4328,52 +4380,52 @@ msgstr ""
 "„folk“, „jazz“, „newage“, „reggae“, „rock“, „soundtrack“ i „misc“."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Postavke mrežnog posrednika"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Koristi mrežni posrednik"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivira postavke mrežnog posrednika."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Ime posrednika :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Ime servera mrežnog posrednika."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Port mrežnog posrednika"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Korisničko ime :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Ime korisnika mrežnog posrednika."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Lozinka :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Lozinka korisnika mrežnog posrednika."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Lista imena numera"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4381,7 +4433,7 @@ msgstr ""
 "Izaberi odgovarajuću audio datoteku (sudeći po mestu ili DLM-u ukoliko je "
 "aktivirano ispod)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4390,7 +4442,7 @@ msgstr ""
 "audio datoteka u glavnoj listi će takođe biti izabrana."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4401,72 +4453,76 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Potvrde"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Potvrdi izlazak iz programa"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 "Ukoliko je aktivirano, otvara se okno za potvrdu pre izlaska iz programa."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Potvrdi upis oznake i datoteku"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Potvrdi preimenovanje datoteke"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Potvrdi brisanje datoteke"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Potvrdi pravljenje liste numera"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Primeni izmene (ali nemoj da ih sačuvaš) i zatvori ovaj prozor"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Zatvori ovaj prozor bez čuvanja"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Sačuva izmene i zatvori prozor"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Primer:%.*d_-_Ime_numere_1.mp3 )"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Izmene su primenjene"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Postavke su sačuvane"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Postavke nisu menjane"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4476,59 +4532,59 @@ msgstr ""
 "Izabrana putanja za podrazumevanu stazu do datoteka nije ispravna!n„%s“\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Nije direktorijum"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Program za reprodukciju zvuka „%s“ nije nađen!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Popuni oznaku"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Preimenuj datoteku i direktorijum"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Obradi polja"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Oznaka uspešno skenirana..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Oznaka uspešno skenirana... (%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 "Skener oznaka: čudno... ekstenzija „%s“ nije nađena u imenu datoteke „%s“!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Greška skenera: ne mogu da nađem razdvajač „%s“ u „%s“"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 "Ne mogu da prevedem ime datoteke „%s“ u sistem kodiranja imena datoteke"
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Novo ime datoteke uspešno skenirano..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Novo ime datoteke uspešno skenirano...(%s)"
@@ -4536,41 +4592,41 @@ msgstr "Novo ime datoteke uspešno skenirano...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Skener oznaka i imena datoteka"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Skener:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Izaberi tip skenera za upotrebu"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Otvori prozor skenera / Skeniraj izabrane datoteke"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Opcije skenera"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Prikaži / Sakrij uređivač maski"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Prikaži / Sakrij legendu"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4579,15 +4635,15 @@ msgstr ""
 "imenu datoteke ili putanji. Koristi se za popunjavanje polja oznaka."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Pregled popunjavanja oznake..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Maska prefiksa sa trenutnom putanjom"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4600,15 +4656,15 @@ msgstr ""
 "apsolutna, u suprotnoj je relativna u odnosu na staru putanju."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Pregled preimenovanja datoteke..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Izaberi polja:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4617,126 +4673,136 @@ msgstr ""
 "vam trebaju."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "D"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Obradi polje za ime datoteke."
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "N"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Obradi polje „Naslov“."
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "I"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Obradi polje „Izvođač“."
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Obradi polje „Izvođač“."
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "A"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Obradi polje „Album“."
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "Ž"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Obradi polje „Žanr“."
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "K"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Obradi polje „Komentar“."
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Kp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Obradi polje „Kompozitor“."
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Obradi polje „Originalni izvođač“."
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Ap"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Obradi polje „Autorsko pravo“."
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Obradi polje „URL“."
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "Kd"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Obradi polje „Kodirano ponoću“."
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Izaberi obratno"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Izaberi sve/ništa"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Prevedi „_“ i „%20“ u „ “"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Prevedi:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "u:"
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4744,7 +4810,7 @@ msgstr ""
 "Donje crtice i karakter „%20“ između reči će biti zamenjeni razmakom. Na "
 "primer „Tekst%20u%20nekom_polju“ će postati „Tekstu nekom polju“."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4752,16 +4818,16 @@ msgstr ""
 "Razmak između reči biće zamenjen donjom crticom. Na primer „Tekst u nekom "
 "polju“ će postati „Tekst_u_nekom_polju“."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4769,7 +4835,7 @@ msgstr ""
 "Sve reči u poljima ispiši velikim slovima. Na primer „Tekst U NEKOM polju“ "
 "će postati „TEKST U NEKOM POLJU“."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4777,7 +4843,7 @@ msgstr ""
 "Sve reči u poljima ispiši malim slovima. Na primer „TEKST U nekom polju“ će "
 "postati „tekst u nekom polju“."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4785,7 +4851,7 @@ msgstr ""
 "Prvo slovo svakog polja promeni u veliko. Na primer „tekst U Nekom POLJU“ će "
 "postati „Tekst u nekom polju“."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4793,7 +4859,7 @@ msgstr ""
 "Svako prvo slovo reči u poljima promeni u veliko. Na primer „Tekst u nekom "
 "POLJU“ će postati „Tekst U Nekom Polju“."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4802,15 +4868,15 @@ msgstr ""
 "Dodaje razmak pre svakog velikog slova. Na primer „TekstUNekomPolju“ će "
 "postati „Tekst U Nekom Polju“."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Umetni razmak pre velikog slova"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Ukloni duple razmake ili donje crtice"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4818,7 +4884,7 @@ msgstr ""
 "Uklanja sve razmake između reči. Na primer „Tekst U Nekom Polju“ će postati "
 "„TekstUNekomPolju“."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4826,7 +4892,7 @@ msgstr ""
 "Dodaje razmak pre svakog velikog slova. Na primer „TekstUNekomPolju“ će "
 "postati „Tekst U Nekom Polju“."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4837,183 +4903,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : izvođač"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : izvođač"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : komentar"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompozitor"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : autorsko pravo"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : broj CD-a"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : kodirano pomoću"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : žanr"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorisano"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : broj numera"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : orig. ivođač"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : numera"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : naslov"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : godina"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Uređivač maski"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Napravi novu masku"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Pomeri masku nagore"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Pomeri masku nadole"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Razmnoži masku"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Dodaj podrazumevanu masku"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Ukloni masku"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Sačuvaj masku"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Nova _maska"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Umnoži: Nije izabran red!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Ukloni: Nije izabran red!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Pomeri nagore: Nije izabran red!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Pomeri nadole: Nije izabran red!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "Greška: Ne mogu da upišem datoteku sa postavkama: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Ne mogu da otvorim datoteku sa postavkama „%s“ (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Učitavam podrazumevane postavke..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Ne mogu da napravim ili otvorim datoteku „%s“ (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "Greška: Ne mogu da upišem listu u datoteku: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Učitavam podrazumevane maske za „Popuni oznaku“..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Učitavam podrazumevane maske za „Preimenuj datoteku“..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Učitavam podrazumevane maske za „Preimenuj direktorijum“..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "Greška: Promenjljiva okruženja „HOME“ nije određena!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "Greška: Ne mogu da napravim direktorijum „%s“ (%s)!"
diff --git a/po/sv.gmo b/po/sv.gmo
index 7a30ed7..d27da2c 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index b8ad5fe..d16c31e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2008-01-28 22:45+0100\n"
 "Last-Translator: Arla <sub at niddler.se>\n"
 "Language-Team: Swedish <LL at li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,6 +30,7 @@ msgstr ""
 "GTK+ gränssnitt underlättar taggning i GNU/Linux."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(Tysk översättning)"
 
@@ -108,137 +110,137 @@ msgstr "(Hebreisk översättning)"
 msgid "(Serbian translation)"
 msgstr "(Serbisk översättning)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "Tilläggsnamn"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "Status"
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "Kommentar"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "Om..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "Om"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompilerad: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(använder: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "Upphovsman: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-post: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Hemsida: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "Beskrivning:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "Tillägg"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "Stöd för MP3-filer"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "aktiverad"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "avstängd"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "Stöd för skrivning av ID3v2.3-taggar"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "tillgänglig"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Stöd för Ogg Vorbis-filer"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Stöd för Speex-filer"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "Stöd för FLAC-filer"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "Stöd för MP4/AAC-filer"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "Stöd för WavPack-filer"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "Tack"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "Översättningar:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "Allmänt:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "Ändringar"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "Kan inte öppna fil '%s' (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "FEL vid försök att öppna fil: '%s' (%s)."
@@ -246,484 +248,494 @@ msgstr "FEL vid försök att öppna fil: '%s' (%s)."
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "_Fil"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "Sortera efter taggar"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "Sortera efter egenskap"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "Stigande ordning efter filnamn"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "Fallande ordning efter filnamn"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "Stigande ordning efter ändringsdatum"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "Fallande ordning efter ändringsdatum"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "Stigande ordning efter spårnummer"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "Fallande ordning efter spårnummer"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "Stigande ordning efter titel"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "Fallande ordning efter titel"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "Stigande ordning efter artist"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "Fallande ordning efter artist"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "Stigande ordning efter artist"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "Fallande ordning efter artist"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "Stigande ordning efter album"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "Fallande ordning efter album"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "Stigande ordning efter år"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "Fallande ordning efter år"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "Stigande ordning efter genre"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "Fallande ordning efter genre"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "Stigande ordning efter kommentarer"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "Fallande ordning efter kommentarer"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "Stigande ordning efter kompositör"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "Fallande ordning efter kompositör"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "Stigande ordning efter originalartist"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "Fallande ordning efter originalartist"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "Stigande ordning efter copyright"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "Fallande ordning efter copyright"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "Stigande ordning efter URL"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "Fallande ordning efter URL"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "Stigande ordning efter omkodarens namn"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "Fallande ordning efter omkodarens namn"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "Stigande ordning efter filtyp"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "Fallande ordning efter filtyp"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "Stigande ordning efter filstorlek"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "Fallande ordning efter filstorlek"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "Stigande ordning efter längd"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "Fallande ordning efter längd"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "Stigande ordning efter bitrate"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "Fallande ordning efter bitrate"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "Stigande ordning efter samplerate"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "Fallande ordning efter samplerate"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "Öppna fil(er) med ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "Välj alla filer"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "Välj bort alla filer"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "Invertera val"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "Radera fil(er)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "_Första filen"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "Första filen"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "F_öregående fil"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "Föregående fil"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "_Nästa fil"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "Nästa fil"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "_Sista filen"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "Sista filen"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "S_canna fil(er)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "Scanna fil(er)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "_Ta bort tagg(ar)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "Ta bort tagg(ar)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "_Ångra senaste filens(ernas) ändringar"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "Ångra senaste filens(ernas) ändringar"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "_Gör om senaste filens(ernas) ändringar"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "Gör om senaste filens(ernas) ändringar"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "_Spara filen(erna)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "Spara filen(erna)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "_Tvinga spara filen(erna)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "Tvinga spara filen(erna)"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "Ångra senaste ändringar"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "Gör om senaste ändringar"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "_Bläddra"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "GÃ¥ till _hemkatalogen"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "GÃ¥ till hemkatalogen"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "Gå till förvald katalog"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "GÃ¥ till hemkatalogen"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "GÃ¥ till hemkatalogen"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "GÃ¥ till hemkatalogen"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "Gå till _förvald katalog"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "Gå till förvald katalog"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "Ställ in de_nna sökväg som förvald"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "Ställ in denna sökväg som förvald"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "Träd-visning | Artist-/Album-baserad visning"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "Byt namn på katalog..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "Ladda om katalogen"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "Bläddra i katalogen med..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "_Slå ihop katalogträd"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "_Uppdatera katalogträd"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "S_canner"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "_Fyll tagg(arna) ..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "Fyll tagg(arna) ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "_Byt namn på fil(erna) och katalogen..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "Byt namn på fil(erna) och katalogen..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "_Bearbeta fält..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "Bearbeta fält..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "_Diverse"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "Sök _fil(er)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "Sök fil(er)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "Cd-data_bassökning..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB-sökning..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "Ladda filnamn från txt-fil..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "Spara spelningslista..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "Starta ljudspelare"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "_Inställningar"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "_Alternativ..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "Alternativ..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "_Om"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "Stoppa pågående åtgärd"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "_Filoperationer"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "CDDB-sök på fil(er)..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "Rensa logg"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "Bläddra i _underkataloger"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "Visa dolda kataloger"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "Visa katalogträd / Visa efter artist och album"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Kunde inte slå samman UI, fel var: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "Färdig att starta..."
 
@@ -732,7 +744,7 @@ msgid "New default path for files selected"
 msgstr "Ny förinställd sökväg vald för filer"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "Bekräfta..."
 
@@ -744,119 +756,124 @@ msgstr ""
 "En del filer har ändrats men inte sparats...\n"
 "Vill du spara dessa innan du byter katalog?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<Alla album>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Fel: Sökte efter %s, kunde inte hitta noden %s i trädet."
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "Träd"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "Filnamn"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "Titel"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "Artist"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artist"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "Album"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "Ã…r"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "Spår"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "Genre"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "Kompositör"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "Originalartist"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 msgid "Encoded By"
 msgstr "Kodad av"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# Filer"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "GÃ¥ upp en katalog"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "Skriv in en katalog att bläddra i."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 msgid "Select a directory to browse."
 msgstr "Välj en katalog att bläddra i."
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u fil(er)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "Artist & Album"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "Byta namn på katalogen"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Byt namn på katalogen '%s' till : "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "Använd mask:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "Använder mask för att ändra katalognamn, om aktiverad."
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -864,31 +881,31 @@ msgstr ""
 "Välj eller skriv in en mask med hjälp av koder (se förklaringen i Scanner-"
 "fönstret) för att namnge katalogen efter taggfält."
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "Ogiltig Scanner-mask"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "Namnge förhandsvisning av katalog..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "Fel..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "Du måste skriva in ett katalognamn!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -923,7 +940,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -932,7 +949,7 @@ msgstr ""
 "Kunde inte ändra namnet, katalognamnet existerar redan!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -947,88 +964,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "Katalognamnet ändrades"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "Program att köra:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Skriv in programmet du vill köra. Det kommer att få aktuell katalog som "
 "parameter."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "Öppna fil med..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Skriv in programmet du vill köra. Det kommer att få aktuell fil som "
 "parameter."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "Du måste skriva in ett programnamn!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Programmet '%s' kunde inte hittas!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kunde inte starta %s (fel %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "Kan inte starta en ny process!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Exekverat kommando: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "Kategori"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "Spårnamn"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "Tid"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "CD-databassökning"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "Automatisk sökning"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "CD-databas förfrågan:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -1036,16 +1053,16 @@ msgstr ""
 "Använd valda filer för att göra en automatisk förfrågan hos CDDB-databas "
 "(ordningen är viktig!) för att generera CddbID."
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "Stoppa sökningen..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "Använd lokal CDDB"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1056,138 +1073,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "Manuell sökning"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "Ord:"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Skriv in sökorden (separerade med mellanslag eller '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "Sök i:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "Alla fält"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "Andra"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "Alla kategorier"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Klassiskt"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inkluderat: funk, soul, rapp, pop, industriell, metall, etc."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "filmer, serier"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "annat som inte passar i ovanstående kategorier"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr "Kategorier"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "Resultat:"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "Sök:"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "Skriv in sökord på raden nedan"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "Sök nästa"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "Sök föregående"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Visa endast röda rader (eller visa alla rader) i 'Artist / Album'-listan"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "Välj bort alla rader"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "Invertera radval"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "Välj alla raderna"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1201,36 +1218,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "Skriv i:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "Alla"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "Spår #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# spår"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "Kör nuvarande scanner för varje fil"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Matcha rader med Levenshteins algoritm"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1245,91 +1262,95 @@ msgstr ""
 "tillämpning av CDDB-resultatet, istället för att direkt använda "
 "positionsordningen."
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Ladda de valda raderna (eller alla rader, om ingen rad är vald)."
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "Redo att söka..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 "Album: '%s', artist: '%s', längd: '%s', år: '%s', genre: '%s', ID: '%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "Invertera val"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "Sortera efter spårnummer"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "Sortera efter spårtitel"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Kopplar upp mot värd '%s' ..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kunde inte koppla upp mot värd '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Kunde inte skapa en ny socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Kopplar upp mot värd '%s', genom port '%d'..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan inte kontakta värd '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Uppkopplad mot värd '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Tar emot data (%s)..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fel vid läsning av CDDB-svar (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan inte skapa fil '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Kan inte öppna fil '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "Skickar förfrågan..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kan inte skicka förfrågan (%s)!"
@@ -1338,62 +1359,63 @@ msgstr "Kan inte skicka förfrågan (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "Tar emot data..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "Servern returnerade ett felaktigt svar!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Servern returnerade ett felaktigt svar! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Tyvärr, den web-baserade sökningen är för tillfället ur funktion!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Hittade %d matchande album"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Tar emot data för sidan %d (album %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Tar emot data för sidan %d..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "Flera resultat att ladda..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "Ingen fil är vald!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Fler än 99 filer valda! Kan inte skicka förfrågan!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fil(er) vald(a)!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "Lokal CD sökning..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
@@ -1401,28 +1423,28 @@ msgstr ""
 "Ingen sökväg för 'Lokal CD Data-Bas' är definierad!\n"
 "Fyll i sökvägen bland inställningarna innan du utför denna sökning."
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Skickar förfrågan (CddbId: %s, # spår: %d, skivlängd: %d)..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Hittade %d matchande album för DiscID '%s'"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Kan inte ladda fil: '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "Laddar albumets spårlista..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1435,7 +1457,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "Skriv taggen från CDDB..."
 
@@ -1694,7 +1716,7 @@ msgstr "Okänd parameter eller sökväg '%s'\n"
 msgid "Browser"
 msgstr "Bläddrare"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "Fil"
 
@@ -1708,11 +1730,11 @@ msgstr "Fillänken är bruten"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Lager ?"
 
@@ -1720,7 +1742,7 @@ msgstr "?, Lager ?"
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1728,17 +1750,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "Frekvens:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Typ:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1755,7 +1777,7 @@ msgid "Time:"
 msgstr "Tid:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "Tagg"
 
@@ -1784,330 +1806,350 @@ msgstr "Artist:"
 msgid "Tag selected files with this artist"
 msgstr "Tagga valda filer med denna artist"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "Artist:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "Tagga valda filer med denna artist"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "Tagga valda filer med detta albumnamn"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "Tagga valda filer med detta skivnummer"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "Ã…r:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "Tagga valda filer med detta år"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Numrera valda spår följdenligt. Starta med 01 i varje underkatalog."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "Spår #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr "Ställ in det totala spårantalet till antalet filer i denna katalog."
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "Tagga valda filer med detta totala spårantal"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "Tagga valda filer med denna genre"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "Tagga valda filer med denna kommentar"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "Kompositör:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "Tagga valda filer med denna kompositör"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "Orig. Artist:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "Tagga valda filer med denna originalartist"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "Tagga valda filer med detta copyright"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "Tagga valda filer med denna URL"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "Kodad av:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "Tagga valda filer med denna kodare"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "Bilder"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "Bilder:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "Du kan använda drag-och-släpp för att lägga till bilder."
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "Tagga valda filer med dessa bilder"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Lägg till bilder till taggen (drag-och-släpp fungerar också)."
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "Ta bort valda bilder, annars alla bilder."
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "Spara de valda bilderna till hårddisken."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "Ställ in egenskaper för de valda bilderna."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Taggade valda filer med titel '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "Tog bort titel från valda filer."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Taggade valda filer med artist '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "Tog bort artist från valda filer."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "Taggade valda filer med artist '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "Tog bort artist från valda filer."
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Taggade valda filer med album '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "Tog bort albumnamn från valda filer."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Taggade valda filer med skivnummer '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "Tog bort skivnummer från valda filer."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Taggade valda filer med år '%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "Tog bort år från valda filer."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Taggade valda filer med spårnummer, enligt 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Taggade valda filer med spårnummer, enligt 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "Tog bort spårnummer från valda filer."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Numrerade valda spår följdenligt."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Taggade valda filer med genre '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "Tog bort genre från valda filer."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Taggade valda filer med kommentar '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "Tog bort kommentar från valda filer."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Taggade valda filer med kompositör '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "Tog bort kompositör från valda filer."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Taggade valda filer med originalartist '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "Tog bort originalartist från valda filer."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Taggade valda filer med copyright '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "Tog bort copyright från valda filer."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Taggade valda filer med URL '%s'."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "Tog bort URL från valda filer."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Taggade valda filer med kodarens namn '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "Tog bort kodarens namn från valda filer."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "Taggade valda filer med bilder."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "Tog bort bilder från valda filer."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Välj läge och mask, och gör om samma åtgärd"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "Alla taggarna har scannats."
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "Alla taggarna har tagits bort."
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "Sök fil(er)..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "Alla filer har sparats..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "Filer har delvis raderats..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "Alla filerna har raderats..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2116,16 +2158,16 @@ msgstr ""
 "Vill du skriva taggen till filen\n"
 "'%s'?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "Skriv tagg..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "Ändra namn på fil och katalog..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2139,11 +2181,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "Ändra katalognamn..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2157,11 +2199,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "Ändra filnamn..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2174,17 +2216,17 @@ msgstr ""
 "till \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Skriver tagg i '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "tagg(ar) skrevs"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2193,21 +2235,21 @@ msgstr ""
 "Kan inte skriva taggen i fil '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "Kan inte skriva taggen i fil '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Ändrar namn på fil '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2220,7 +2262,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2229,11 +2271,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "Filnamn inte ändrat(de)..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2246,7 +2288,7 @@ msgstr ""
 "på grund av att filen redan existerar:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2255,7 +2297,7 @@ msgstr ""
 "på grund av att filen redan existerar:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2266,7 +2308,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2275,16 +2317,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Filnamnet '%s' ändrat till '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "Filnamn ändrat(de)..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2295,7 +2337,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2304,17 +2346,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Flyttade fil '%s' till '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "Fil(erna) flyttade..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2327,7 +2369,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2336,11 +2378,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "Fil(er) ej flyttade..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2349,16 +2391,16 @@ msgstr ""
 "Är du säker på att du definitivt vill radera fil\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "Radera fil..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fil '%s' raderad"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2370,109 +2412,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "Sökning pågår..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "Fil: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Hittade %d fil(er) i denna katalog och underkataloger."
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "Hittade %d fil(er) i denna katalog."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fil(er)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "Hittade ingen fil i denna katalog eller underkataloger!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "Ingen fil hittades i denna katalog!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "Söker..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  STOPPA sökningen...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "Välj en katalog att bläddra i!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "Tagga valda filer med detta fält"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertera '_' och '%20' till mellanslag"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "Konvertera ' ' till '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "Enbart versaler"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "Enbart gemener"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "Första bokstaven versal"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "Första bokstaven versal i varje ord"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "Avlägsna mellanslag"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "Lägg in mellanslag före varje versal"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "Avlägsna dubbletter av mellanslag och nedsänkta streck"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Onormal avstängning! (PId: %d)."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Mottog signal %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2482,11 +2523,11 @@ msgstr ""
 "med en gdb-bakåtspårning ('gdb easytag core' sedan 'bt' och 'l') och "
 "information om hur man kan upprepa detta, till easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "Okänd signal"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2519,11 +2560,11 @@ msgstr ""
 "sökväg_till/filer     Använd en relativ sökväg.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Avslutades normalt."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2531,82 +2572,82 @@ msgstr ""
 "Vissa filer har ändrats men inte sparats...\n"
 "Vill du spara dessa filer innan du avslutar programmet?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "Vill du avsluta programmet?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3-tagg"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis-tagg"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis-tagg"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE-tagg"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC-tagg"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack-tagg"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3-fil"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2-fil"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis-fil"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex-fil"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC-fil"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack-fil"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio-fil"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC-fil"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack-fil"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Bilder (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2614,14 +2655,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2632,11 +2673,11 @@ msgstr ""
 "till systemets filnamnskodning\n"
 "(Försök att ställa in miljövariabeln G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "Filnamnsöversättning"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Filnamnet '%s' överstiger %d tecken och kommer att förkortas!\n"
@@ -2660,54 +2701,54 @@ msgstr "Kodare:"
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "FEL vid försök att öppna fil: '%s' som FLAC (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr "Bildblocket är inte användbart: '%s'"
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FEL: Misslyckades med att skriva kommentarer till filen '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Skriver tagg av '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Avlägsna taggen från '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fel vid borttagning av ID3v1-taggen från '%s' (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fel vid borttagning av ID3v2-taggen från '%s' (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fel vid uppdatering av ID3v2 taggen på '%s' (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2732,77 +2773,77 @@ msgstr ""
 "\n"
 "Fil: %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fel vid uppdatering av ID3v1 taggen på '%s' (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Uppdaterade taggen på '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "Inga fel rapporterades"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "Inte tillräckligt mycket minne"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "Ingen data att analysera"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "Felaktigt formaterad data"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "Ingen buffert att skriva till"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "Bufferten är för liten"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "Ogiltigt ram-ID"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "Efterfrågat fält kunde inte hittas"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "Okänd fälttyp"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "Taggen är redan kopplad till en fil"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "Ogiltig taggversion"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "Ingen fil att analysera"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "Försöker att skriva till en skrivskyddad fil"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "Fel vid (de)komprimering"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "Okänt felmeddelande!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2811,7 +2852,7 @@ msgstr ""
 "Eftersom följande korrupta fil: '%s'\n"
 "kommer att orsaka fel i id3lib, kommer den inte att köras av programmet."
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "Trasig fil..."
 
@@ -2819,74 +2860,74 @@ msgstr "Trasig fil..."
 msgid "Log"
 msgstr "Logg"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "Välj fil..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "Välj katalog..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "Varning..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "Ingen ljudspelare har definierats"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "Kan inte köra %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "kB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "Generera en spelningslista"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "Namn på M3U-spelningslista"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "Använd katalogens namn"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "Redigera masker"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "Alternativ för spelningslista"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "Inkludera enbart de valda filerna"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2894,52 +2935,52 @@ msgstr ""
 "Om aktiverad kommer enbart dom valda filerna att skrivas till "
 "spelningslistans fil. Annars skrivs samtliga filer."
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "Använd fullständig sökväg för filerna i spelningslistan"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "Använd relativ sökväg för filerna i spelningslistan"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "Skapa en spel-lista i föräldrakatalogen"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Om aktiverad kommer en spelningslista att skapas i föräldrakatalogen"
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "Använd DOS-katalogseparering"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Detta alternativ byter UNIX-katalogseparering '/' till DOS-separering '\\'."
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "Spelningslisteinnehåll"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "Skriv enbart en lista över filerna"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "Använd filnamnet för att skriva info"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "Skriva info med:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2948,12 +2989,12 @@ msgstr ""
 "Spelningslistan '%s' existerar redan!\n"
 "Skriva över?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "Skriva spelningslista..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2962,24 +3003,24 @@ msgstr ""
 "Kan inte skriva spelningslistan '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Skrev spelningslista '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "Kodad av"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "Sök efter fil"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2987,86 +3028,86 @@ msgstr ""
 "att visa alla filer."
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "Inuti:"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "filnamnet"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "taggen"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Skiftlägeskänsligt"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Hittade: %d fil(er)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "Ladda filnamn från en txt-fil"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "Fil:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " Ladda"
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "Txt-filens innehåll"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "Lägg till en tom rad före den valda raden"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "Radera den valda raden"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "Radera alla blanka rader"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "Flytta upp den valda raden"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "Flytta ned den valda raden"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "Ladda om"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "Lista över filer"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "Vald rad:"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3074,19 +3115,19 @@ msgstr ""
 "När detta alternativ är aktiverat, kommer den nuvarande scannern att köras "
 "på filerna efter att fälten laddats (scanner-fönstret måste vara öppet)."
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "Lägg till en blank rad"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "Radera denna rad"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "Flytta upp denna rad"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "Flytta ned denna rad"
 
@@ -3170,12 +3211,12 @@ msgstr ""
 "Ogg Vorbis: Internt logikfel, indikerar en bugg eller heap-/stack-"
 "förvanskning (fil: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FEL: Misslyckades med att öppna filen: '%s' som Vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Varning : Ogg Vorbis-filen '%s' innehåller en ID3v2-tagg."
@@ -3776,7 +3817,7 @@ msgid ""
 msgstr ""
 "Tvinga användandet av systemets teckenkodning och aktivera transskribering"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3793,7 +3834,7 @@ msgstr ""
 "Tvinga användandet av systemets teckenkodning och avlägsna övriga tecken i "
 "tysthet"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3950,22 +3991,33 @@ msgstr "Använd komprimering"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "Ställ in komprimering i ID3v2-taggarna"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "Teckenkodning för skrivning av ID3-taggar"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2-taggar"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "Skriv ID3v2-tagg"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
@@ -3974,11 +4026,11 @@ msgstr ""
 "början av MP3-filerna. I annat fall kommer den att tas bort."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "Version:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3990,34 +4042,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "Teckenkod:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Unicode-typ att använda"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "Teckenuppsättning som används för att skriva taggdata i filen."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "Vidare inställningar för iconv():"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "Ingen"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
@@ -4027,25 +4079,25 @@ msgstr ""
 "målteckenkodningen. Notera dock att ett felmeddelande kommer att visas med "
 "information om detta."
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1-taggar"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "Skriv ID3v1.x-taggar"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4053,28 +4105,28 @@ msgstr ""
 "Om aktiverad kommer en ID3v1-tagg att läggas till eller uppdateras i slutet "
 "av MP3 filer. I annat fall kommer den att tas bort."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Teckenuppsättning att använda för att skriva ID3v1-taggdata i filen."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "Teckenuppsättning för läsning av ID3-taggar"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Ej standard:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4087,8 +4139,8 @@ msgstr ""
 "och/eller ID3v1-taggar).\n"
 "\n"
 "Exempelvis :\n"
-"  - i tidigare versioner av EasyTAG kan du spara UTF-8 strängar i ett ISO-"
-"8859-1-fält. Detta är inte korrekt! För att konvertera dessa taggar till "
+"  - i tidigare versioner av EasyTAG kan du spara UTF-8 strängar i ett "
+"ISO-8859-1-fält. Detta är inte korrekt! För att konvertera dessa taggar till "
 "Unicode: aktivera detta alternativ och välj UTF-8. Du måste även aktivera "
 "alternativet 'Försök att spara taggar i ISO-8859-1. Om det inte är möjligt "
 "att använda UNICODE (rekommenderas)' eller 'Spara alltid taggar i UNICODE-"
@@ -4097,31 +4149,31 @@ msgstr ""
 "teckenkodningen 'Windows-1251' för att ladda taggar skrivna i Windows. Och "
 "'KOI8-R' för att ladda taggar skrivna i Unix-system."
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "Teckenuppsättning att använda för att läsa taggdata i filen."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Scanner för taggfyllning - teckenkonvertering"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertera understreck '_' och '%20'-strängar till mellanslag ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertera mellanslag ' ' till understreck '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4130,11 +4182,11 @@ msgstr ""
 "från scannern för taggar."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Scanner för filnamnbyte - teckenkonvertering"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4143,18 +4195,18 @@ msgstr ""
 "från scannern för filer."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Scanner för fältbearbetning - teckenkonvertering"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Versalisera inte begynnelsebokstaven i (engelska) prepositioner och artiklar."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4167,15 +4219,15 @@ msgstr ""
 "Entry' istället för 'Text In An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "Scannerfönster"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "Öppna Scannerfönstret vid start"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4183,11 +4235,11 @@ msgstr ""
 "Aktivera detta alternativ för att automatiskt öppna scannerfönstret när "
 "EasyTAG startas."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "Scannerfönstret alltid överst"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4196,16 +4248,16 @@ msgstr ""
 "huvudfönstret."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "Fält"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "Skriv över fält när taggar scannas"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4214,11 +4266,11 @@ msgstr ""
 "nya texten. Om avaktiverad så fylls enbart de blanka fälten i taggen med ny "
 "text."
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "Använd denna text som förvald kommentar:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4227,11 +4279,11 @@ msgstr ""
 "fältet när 'fyll tagg'-scannern används."
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "Använd CRC32 som förvald kommentar (endast för filer med ID3 taggar)."
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4242,42 +4294,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD-databas"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "Serverinställningar för automatisk sökning"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "Namn:"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "Port:"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI Sökväg:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "Serverinställningar för manuell sökning"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "Lokal CD-databas"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "Sökväg:"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4289,52 +4341,52 @@ msgstr ""
 "'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' och 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Proxy-inställningar"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "Använd en proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivera inställningarna för proxyservern."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "Värdnamn:"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Proxyserverns namn."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Port att använda för proxyservern."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "Användarnamn:"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Namn på användare för proxyservern."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "Användarlösenord:"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Användarens lösenord för proxyservern."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "Spårnamnslista"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4342,7 +4394,7 @@ msgstr ""
 "Välj motsvarande ljudfil (i enlighet med positionen, eller DLM om aktiverad "
 "nedan)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4351,7 +4403,7 @@ msgstr ""
 "spårnamnslistan."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4362,15 +4414,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "Bekräfta"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "Bekräfta avslut av programmet"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4378,57 +4430,61 @@ msgstr ""
 "Om aktiverat kommer en dialog att öppnas med förfrågan efter bekräftelse "
 "före avslut av program."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "Bekräfta skrivning av filtagg"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "Bekräfta filnamnbyte"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "Bekräfta filradering"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "Bekräfta skrivning av spellista"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Tillämpa ändringar (men spara inte) och stäng denna dialog"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "Stäng detta fönster utan att spara"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "Spara ändringar och stäng detta fönster"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exempel: %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "Ändringarna har tillämpats"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "Konfigurationen sparad"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "Konfigurationen oförändrad"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4439,58 +4495,58 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "Inte en katalog"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Ljudspelaren '%s' kan inte hittas!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "Fyll tagg"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Byt namn på fil och katalog"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "Bearbeta fält"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "Taggar har scannats..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Taggar har scannats... (%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 "Taggscanner: Mystiskt... ändelsen '%s' kunde inte hittas i filnamnet '%s'!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Scannerfel: kan inte finna separator '%s' inuti '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Kunde inte konvertera filnamnet '%s' till systemets filnamnskodning."
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "Nytt filnamn har scannats..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nytt filnamn har scannats... (%s)"
@@ -4498,41 +4554,41 @@ msgstr "Nytt filnamn har scannats... (%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "Tagg- och filnamnsscanner"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "Scanner:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "Välj typ av scanner att använda"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "Öppna scannerfönstret / Scanna valda filer"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "Scanneralternativ"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "Visa / dölj mask-editorn"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "Visa / dölj symbolförklaring"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4541,15 +4597,15 @@ msgstr ""
 "scannerfönstret) för analysera filnamn och sökväg samt fylla i taggfält."
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "Förhandsvisning av filtagg..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "Föregå mask med nuvarande sökväg"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4562,15 +4618,15 @@ msgstr ""
 "sökväg, i annat fall är den relativ till den gamla sökvägen."
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "Förhandsvisning av filer med ändrade namn..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "Välj fält:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4579,126 +4635,136 @@ msgstr ""
 "är intressanta."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "Bearbeta filnamnsfält"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "Bearbeta titelfält"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "Bearbeta artistfält"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "Bearbeta artistfält"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "Bearbeta albumfält"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "Bearbeta genrefält"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Km"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "Bearbeta kommentarfält"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Kp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "Bearbeta kompositörfält"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "Oa"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "Bearbeta originalartist-fält"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Co"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "Bearbeta copyright-fält"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "Bearbeta URL-fält"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "Kd"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "Bearbeta kodarnamn-fält"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "Invertera valen"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "Välj (bort) alla."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertera '_' och '%20' till ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "Konvertera:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "till: "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4706,7 +4772,7 @@ msgstr ""
 "Understreck och strängen '%20' byts ut mot ett mellanslag. Exempelvis, före: "
 "'Text%20i%20en_tagg', efter: 'Text i en tagg'."
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4714,18 +4780,18 @@ msgstr ""
 "Mellanslag byts ut mot understreck. Exempelvis, före:  'Text i en tagg', "
 "Efter: 'Text_i_en_tagg'."
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 "Byt ut en sträng mot en annan. Notera att sökningen gör skillnad mellan "
 "gemener och versaler."
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4733,7 +4799,7 @@ msgstr ""
 "Konvertera alla ord i ett fält till versaler. Exempel, före: 'Text I EN "
 "tagg', efter: 'TEXT I EN TAGG'."
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4741,7 +4807,7 @@ msgstr ""
 "Konvertera alla ord i ett fält till gemener. Exempel, före: 'Text I EN "
 "tagg', efter: 'text i en tagg'."
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4749,7 +4815,7 @@ msgstr ""
 "Konvertera begynnelsebokstaven i det första ordet i varje fält till versal. "
 "Exempel, före: 'text I En TAGG', efter: 'Text i en tagg'."
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4757,7 +4823,7 @@ msgstr ""
 "Konvertera begynnelsebokstaven i varje ord till en versal i varje fält. "
 "Exempel, före: 'Text i en TAGG', efter: 'Text I En Tagg'."
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4766,15 +4832,15 @@ msgstr ""
 "Ett mellanslag sätts in mellan varje versal. Exempel, före: 'TextIEnTagg', "
 "efter: 'Text I En Tagg'."
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "Lägg till mellanslag före stor bokstav"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "Ta bort upprepningar av mellanslag eller understreck"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4782,7 +4848,7 @@ msgstr ""
 "Alla mellanslag tas bort. Exempel, före: 'Text I En Tagg', efter: "
 "'TextIEnTagg'."
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4790,7 +4856,7 @@ msgstr ""
 "Ett mellanslag sätts in mellan varje versal. Exempel, före: 'TextIEnTagg', "
 "efter: 'Text I En Tagg'."
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4801,183 +4867,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "Symbolförklaring"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artist"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : artist"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : kommentar"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompositör"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : copyright"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : skivnummer"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : kodad av"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorerad"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : antal spår"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : originalartist"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : spår"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : år"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "Maskeditor"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "Skapa en ny mask"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "Flytta upp denna mask"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "Flytta ned denna mask"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "Kopiera mask"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "Lägg till förinställda masker"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "Ta bort mask"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "Spara masker"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "Ny_mask"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "Kopiering: Ingen rad vald!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "Ta bort: Ingen rad vald!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "Flytta upp: Ingen rad vald!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "Flytta ned: Ingen rad vald!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FEL: Kan inte skriva konfigurationsfil: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan inte öppna konfigurationsfil %s (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "Laddar förinställd konfiguration..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan inte skapa eller öppna fil '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "FEL: Kan inte skriva lista till fil: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Laddar förinställda 'fyll tagg'-masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "Laddar förinställda 'ändra namn på fil'-masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Laddar förinställda 'ändra namn på katalog'-masker..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "FEL: Miljövariabeln HOME är inte definierad!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEL: Kan inte skapa katalog '%s' (%s)!"
@@ -5212,10 +5283,10 @@ msgstr "Ljudspelare: '%s'"
 #~ "for writing ID3 tags', it will be used instead of ISO-8859-1.\n"
 #~ "Also some rules can be defined if some characters can't be converted."
 #~ msgstr ""
-#~ "UNICODE's teckenuppsättning kommer att användas om konvertering till ISO-"
-#~ "8859-1 misslyckas. Unicode kan användas till ID3v2 men inte till ID3v1 "
-#~ "taggar vilka använder en byte's teckenuppsättningar (default ISO-8859-"
-#~ "1).\n"
+#~ "UNICODE's teckenuppsättning kommer att användas om konvertering till "
+#~ "ISO-8859-1 misslyckas. Unicode kan användas till ID3v2 men inte till "
+#~ "ID3v1 taggar vilka använder en byte's teckenuppsättningar (default "
+#~ "ISO-8859-1).\n"
 #~ "\n"
 #~ "Om en annan teckenuppsättning valts med 'Använd en icke standard "
 #~ "teckenuppsättning för att skriva i ID3 taggar', så kommer denna att "
diff --git a/po/uk.gmo b/po/uk.gmo
index 7682948..70b3698 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index df96b31..9eb8565 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,20 +2,21 @@
 # Copyright (C) 2001-2004 Free Software Foundation, Inc.
 # Olexander Kunytsa, <kunia at istc.kiev.ua>, 2001, 2002.
 # Cawko Xakep <xakep at snark.ukma.kiev.ua>, 2001, 2002, 2003.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: EasyTag 0.28.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2003-09-12 12:02+0300\n"
 "Last-Translator: Cawko Xakep <xakep at snark.ukma.kiev.ua>\n"
 "Language-Team: Ukrainian <linux at linux.org.ua>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-U\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/about.c:141
 #, fuzzy
@@ -29,6 +30,7 @@ msgstr ""
 "¦ÎÔÅÒÆÅÊÓ GTK+ ÄÏÐÏÍÏÖÅ ÐÒÏÃÅÓÕ ÚÁÐÉÓÕ ÔÅǦ×."
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(ðÅÒÅËÌÁÄ Î¦ÍÅÃØËÏÀ)"
 
@@ -116,112 +118,112 @@ msgstr "(
 msgid "(Serbian translation)"
 msgstr "(ðÅÒÅËÌÁÄ Î¦ÍÅÃØËÏÀ)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "ëÏÍÅÎÔÁÒ"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "ðÒÏ..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "ðÒÏ"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Ú¦ÂÒÁÎÏ: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(×ÉËÏÒÉÓÔÏ×ÕÀ: gtk+ %d.%d.%d ÔÁ id3lib %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "á×ÔÏÒ: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "äÏÍÁÛÎÑ ÓÔÏÒ¦ÎËÁ: "
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "èÁÒÁËÔÅÒÉÓÔÉËÁ:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(ЦÄÔÒÉÍËÕ OGG ×ÉÍËÎÅÎÏ)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 #, fuzzy
 msgid "enabled"
 msgstr "ÚÁËÌÁÄËÁÍÉ"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(ЦÄÔÒÉÍËÕ OGG ×ÉÍËÎÅÎÏ)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "îÅÄÏÓÔÁÔÎØÏ ÐÁÍ'ÑÔ¦"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(ЦÄÔÒÉÍËÕ OGG ×ÉÍËÎÅÎÏ)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(ЦÄÔÒÉÍËÕ OGG ×ÉÍËÎÅÎÏ)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(ЦÄÔÒÉÍËÕ OGG ×ÉÍËÎÅÎÏ)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(ЦÄÔÒÉÍËÕ OGG ×ÉÍËÎÅÎÏ)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(ЦÄÔÒÉÍËÕ OGG ×ÉÍËÎÅÎÏ)"
@@ -229,33 +231,33 @@ msgstr "(Ц
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "ðÏÄÑËÉ"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "ðÅÒÅËÌÁÄÉ:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "úÁÇÁÌØΦ:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "úͦÎÉ"
 
-#: src/about.c:622
+#: src/about.c:626
 #, fuzzy, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ '%s' (%s)"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ðïíéìëá צÄËÒÉÔÔÑ ÆÁÊÌÁ: '%s' (%s)."
@@ -263,526 +265,536 @@ msgstr "
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 #, fuzzy
 msgid "_File"
 msgstr "/æÁÊÌ"
 
-#: src/bar.c:147
+#: src/bar.c:149
 #, fuzzy
 msgid "Sort list by tag"
 msgstr "óÏÒÔÕ×ÁÔÉ ÓÐÉÓÏË ÆÁÊÌ¦× ÚÁ: "
 
-#: src/bar.c:148
+#: src/bar.c:150
 #, fuzzy
 msgid "Sort list by property"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÚÒÏÓÔÁÎÎÑÍ ÞÁÓÔÏÔÉ ÄÉÓËÒÅÔÉÚÁæ§"
 
-#: src/bar.c:149
+#: src/bar.c:151
 #, fuzzy
 msgid "Ascending by filename"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ"
 
-#: src/bar.c:150
+#: src/bar.c:152
 #, fuzzy
 msgid "Descending by filename"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ"
 
-#: src/bar.c:151
+#: src/bar.c:153
 #, fuzzy
 msgid "Ascending by creation date"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÄÁÔÉ ÓÔ×ÏÒÅÎÎÑ"
 
-#: src/bar.c:152
+#: src/bar.c:154
 #, fuzzy
 msgid "Descending by creation date"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÄÁÔÉ ÓÔ×ÏÒÅÎÎÑ"
 
-#: src/bar.c:153
+#: src/bar.c:155
 #, fuzzy
 msgid "Ascending by track number"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÎÏÍÅÒÁ ÔÒÅËÁ"
 
-#: src/bar.c:154
+#: src/bar.c:156
 #, fuzzy
 msgid "Descending by track number"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÎÏÍÅÒÁ ÔÒÅËÁ"
 
-#: src/bar.c:155
+#: src/bar.c:157
 #, fuzzy
 msgid "Ascending by title"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ ËÏÍÐÏÚÉæ§"
 
-#: src/bar.c:156
+#: src/bar.c:158
 #, fuzzy
 msgid "Descending by title"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ ËÏÍÐÏÚÉæ§"
 
-#: src/bar.c:157
+#: src/bar.c:159
 #, fuzzy
 msgid "Ascending by artist"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
 
-#: src/bar.c:158
+#: src/bar.c:160
 #, fuzzy
 msgid "Descending by artist"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
+
+#: src/bar.c:163
 #, fuzzy
 msgid "Ascending by album"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÎÁÚ×É ÁÌØÂÏÍÕ"
 
-#: src/bar.c:160
+#: src/bar.c:164
 #, fuzzy
 msgid "Descending by album"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÎÁÚ×É ÁÌØÂÏÍÕ"
 
-#: src/bar.c:161
+#: src/bar.c:165
 #, fuzzy
 msgid "Ascending by year"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÒÏËÕ"
 
-#: src/bar.c:162
+#: src/bar.c:166
 #, fuzzy
 msgid "Descending by year"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÒÏËÕ"
 
-#: src/bar.c:163
+#: src/bar.c:167
 #, fuzzy
 msgid "Ascending by genre"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÖÁÎÒÕ"
 
-#: src/bar.c:164
+#: src/bar.c:168
 #, fuzzy
 msgid "Descending by genre"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÖÁÎÒÕ"
 
-#: src/bar.c:165
+#: src/bar.c:169
 #, fuzzy
 msgid "Ascending by comment"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÄÁÔÉ ËÏÍÅÎÔÁÒÑ"
 
-#: src/bar.c:166
+#: src/bar.c:170
 #, fuzzy
 msgid "Descending by comment"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÄÁÔÉ ËÏÍÅÎÔÁÒÑ"
 
-#: src/bar.c:167
+#: src/bar.c:171
 #, fuzzy
 msgid "Ascending by composer"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÄÁÔÉ ËÏÍÅÎÔÁÒÑ"
 
-#: src/bar.c:168
+#: src/bar.c:172
 #, fuzzy
 msgid "Descending by composer"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÄÁÔÉ ËÏÍÅÎÔÁÒÑ"
 
-#: src/bar.c:169
+#: src/bar.c:173
 #, fuzzy
 msgid "Ascending by original artist"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
 
-#: src/bar.c:170
+#: src/bar.c:174
 #, fuzzy
 msgid "Descending by original artist"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
 
-#: src/bar.c:171
+#: src/bar.c:175
 #, fuzzy
 msgid "Ascending by copyright"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
 
-#: src/bar.c:172
+#: src/bar.c:176
 #, fuzzy
 msgid "Descending by copyright"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ ×ÉËÏÎÁ×ÃÑ"
 
-#: src/bar.c:173
+#: src/bar.c:177
 #, fuzzy
 msgid "Ascending by URL"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÒÏËÕ"
 
-#: src/bar.c:174
+#: src/bar.c:178
 #, fuzzy
 msgid "Descending by URL"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÒÏËÕ"
 
-#: src/bar.c:175
+#: src/bar.c:179
 #, fuzzy
 msgid "Ascending by encoder name"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ÖÁÎÒÕ"
 
-#: src/bar.c:176
+#: src/bar.c:180
 #, fuzzy
 msgid "Descending by encoder name"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ÖÁÎÒÕ"
 
-#: src/bar.c:177
+#: src/bar.c:181
 #, fuzzy
 msgid "Ascending by file type"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ"
 
-#: src/bar.c:178
+#: src/bar.c:182
 #, fuzzy
 msgid "Descending by file type"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ"
 
-#: src/bar.c:179
+#: src/bar.c:183
 #, fuzzy
 msgid "Ascending by file size"
 msgstr "úÁ ÚÒÏÓÔÁÎÎÑÍ ¦ÍÅΦ"
 
-#: src/bar.c:180
+#: src/bar.c:184
 #, fuzzy
 msgid "Descending by file size"
 msgstr "úÁ ÓÐÁÄÁÎÎÑÍ ¦ÍÅΦ"
 
-#: src/bar.c:181
+#: src/bar.c:185
 #, fuzzy
 msgid "Ascending by duration"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÚÒÏÓÔÁÎÎÑÍ ÞÁÓÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
-#: src/bar.c:182
+#: src/bar.c:186
 #, fuzzy
 msgid "Descending by duration"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÓÐÁÄÁÎÎÑÍ ÞÁÓÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
-#: src/bar.c:183
+#: src/bar.c:187
 #, fuzzy
 msgid "Ascending by bitrate"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÚÒÏÓÔÁÎÎÑÍ Â¦ÔÒÅÊÔÁ"
 
-#: src/bar.c:184
+#: src/bar.c:188
 #, fuzzy
 msgid "Descending by bitrate"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÓÐÁÄÁÎÎÑÍ Â¦ÔÒÅÊÔÁ"
 
-#: src/bar.c:185
+#: src/bar.c:189
 #, fuzzy
 msgid "Ascending by samplerate"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÚÒÏÓÔÁÎÎÑÍ ÞÁÓÔÏÔÉ ÄÉÓËÒÅÔÉÚÁæ§"
 
-#: src/bar.c:186
+#: src/bar.c:190
 #, fuzzy
 msgid "Descending by samplerate"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÓÐÁÄÁÎÎÑÍ ÞÁÓÔÏÔÉ ÄÉÓËÒÅÔÉÚÁæ§"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "÷¦ÄËÒÉÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "÷ÉÂÒÁÔÉ ×Ó¦ ÆÁÊÌ"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "óËÁÓÕ×ÁÔÉ ×ɦÒËÕ"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ɦÒËÕ"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "÷ÉÄÁÌÅÎÎÑ ÆÁÊ̦×"
 
-#: src/bar.c:193
+#: src/bar.c:197
 #, fuzzy
 msgid "_First File"
 msgstr "/æÁÊÌ/ðÅÒÛÉÊ ÆÁÊÌ"
 
-#: src/bar.c:193
+#: src/bar.c:197
 #, fuzzy
 msgid "First File"
 msgstr "/æÁÊÌ/ðÅÒÛÉÊ ÆÁÊÌ"
 
-#: src/bar.c:194
+#: src/bar.c:198
 #, fuzzy
 msgid "_Previous File"
 msgstr "/æÁÊÌ/ðÏÐÅÒÅÄÎ¦Ê ÆÁÊÌ"
 
-#: src/bar.c:194
+#: src/bar.c:198
 #, fuzzy
 msgid "Previous File"
 msgstr "/æÁÊÌ/ðÏÐÅÒÅÄÎ¦Ê ÆÁÊÌ"
 
-#: src/bar.c:195
+#: src/bar.c:199
 #, fuzzy
 msgid "_Next File"
 msgstr "/æÁÊÌ/îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
 
-#: src/bar.c:195
+#: src/bar.c:199
 #, fuzzy
 msgid "Next File"
 msgstr "/æÁÊÌ/îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
 
-#: src/bar.c:196
+#: src/bar.c:200
 #, fuzzy
 msgid "_Last File"
 msgstr "/æÁÊÌ/ïÓÔÁÎÎ¦Ê ÆÁÊÌ"
 
-#: src/bar.c:196
+#: src/bar.c:200
 #, fuzzy
 msgid "Last File"
 msgstr "/æÁÊÌ/ïÓÔÁÎÎ¦Ê ÆÁÊÌ"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 #, fuzzy
 msgid "S_can File(s)"
 msgstr "/æÁÊÌ/óËÁÎÕ×ÁÔÉ ÆÁÊÌ"
 
-#: src/bar.c:199
+#: src/bar.c:203
 #, fuzzy
 msgid "Scan File(s)"
 msgstr "/æÁÊÌ/óËÁÎÕ×ÁÔÉ ÆÁÊÌ"
 
-#: src/bar.c:200
+#: src/bar.c:204
 #, fuzzy
 msgid "_Remove Tag(s)"
 msgstr "/æÁÊÌ/÷ÉÄÁÌÉÔÉ ÔÅÇÉ"
 
-#: src/bar.c:200
+#: src/bar.c:204
 #, fuzzy
 msgid "Remove Tag(s)"
 msgstr "/æÁÊÌ/÷ÉÄÁÌÉÔÉ ÔÅÇÉ"
 
-#: src/bar.c:201
+#: src/bar.c:205
 #, fuzzy
 msgid "_Undo Last File(s) Changes"
 msgstr "/æÁÊÌ/÷_iÄͦÎÉÔÉ ÚͦÎÉ × ÏÓÔÁÎÎØÏÍÕ ÆÁÊ̦"
 
-#: src/bar.c:201
+#: src/bar.c:205
 #, fuzzy
 msgid "Undo Last File(s) Changes"
 msgstr "/æÁÊÌ/÷_iÄͦÎÉÔÉ ÚͦÎÉ × ÏÓÔÁÎÎØÏÍÕ ÆÁÊ̦"
 
-#: src/bar.c:202
+#: src/bar.c:206
 #, fuzzy
 msgid "R_edo Last File(s) Changes"
 msgstr "/æÁÊÌ/ðÏ×ÔÏÒÉÔÉ ÚͦÎÉ × ÏÓÔÁÎÎØÏÍÕ ÆÁÊ̦"
 
-#: src/bar.c:202
+#: src/bar.c:206
 #, fuzzy
 msgid "Redo Last File(s) Changes"
 msgstr "/æÁÊÌ/ðÏ×ÔÏÒÉÔÉ ÚͦÎÉ × ÏÓÔÁÎÎØÏÍÕ ÆÁÊ̦"
 
-#: src/bar.c:203
+#: src/bar.c:207
 #, fuzzy
 msgid "_Save File(s)"
 msgstr "/æÁÊÌ/úÂÅÒÅÇÔÉ ÆÁÊÌÉ"
 
-#: src/bar.c:203
+#: src/bar.c:207
 #, fuzzy
 msgid "Save File(s)"
 msgstr "/æÁÊÌ/úÂÅÒÅÇÔÉ ÆÁÊÌÉ"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "_Force Saving File(s)"
 msgstr "/æÁÊÌ/óËÁÎÕ×ÁÔÉ ÆÁÊÌ"
 
-#: src/bar.c:204
+#: src/bar.c:208
 #, fuzzy
 msgid "Force Saving File(s)"
 msgstr "/æÁÊÌ/óËÁÎÕ×ÁÔÉ ÆÁÊÌ"
 
-#: src/bar.c:205
+#: src/bar.c:209
 #, fuzzy
 msgid "Undo Last Changes"
 msgstr "/æÁÊÌ/óËÁÓÕ×ÁÔÉ ÏÓÔÁÎΦ ÚͦÎÉ"
 
-#: src/bar.c:206
+#: src/bar.c:210
 #, fuzzy
 msgid "Redo Last Changes"
 msgstr "/æÁÊÌ/ðÏ×ÔÏÒÉÔÉ ÏÓÔÁÎΦ ÚͦÎÉ"
 
-#: src/bar.c:207
+#: src/bar.c:211
 #, fuzzy
 msgid "_Quit"
 msgstr "/æÁÊÌ/÷ÉȦÄ"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr ""
 
-#: src/bar.c:209
+#: src/bar.c:213
 #, fuzzy
 msgid "_Browser"
 msgstr "/ðÅÒÅÇÌÑÄÁÞ"
 
-#: src/bar.c:210
+#: src/bar.c:214
 #, fuzzy
 msgid "Go to _Home Directory"
 msgstr "ðÅÒÅÊÔÉ × ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "ðÅÒÅÊÔÉ × ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "ðÅÒÅÊÔÉ Õ ÓÔÁÒÔÏ×ÉÊ ËÁÔÁÌÏÇ"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "ðÅÒÅÊÔÉ × ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "ðÅÒÅÊÔÉ × ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "ðÅÒÅÊÔÉ × ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: src/bar.c:215
+#: src/bar.c:219
 #, fuzzy
 msgid "Go to _Default Directory"
 msgstr "ðÅÒÅÊÔÉ Õ ÓÔÁÒÔÏ×ÉÊ ËÁÔÁÌÏÇ"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "ðÅÒÅÊÔÉ Õ ÓÔÁÒÔÏ×ÉÊ ËÁÔÁÌÏÇ"
 
-#: src/bar.c:216
+#: src/bar.c:220
 #, fuzzy
 msgid "Set _Current Path as Default"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÓÔÁÒÔÏ×ÉÍ ËÁÔÁÌÏÇÏÍ"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÓÔÁÒÔÏ×ÉÍ ËÁÔÁÌÏÇÏÍ"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr ""
 
-#: src/bar.c:218
+#: src/bar.c:222
 #, fuzzy
 msgid "Rename Directory ..."
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ËÁÔÁÌÏÇ..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "ðÅÒÅÞÉÔÁÔÉ ËÁÔÁÌÏÇ"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 #, fuzzy
 msgid "_Collapse Tree"
 msgstr "úÇÏÒÎÕÔÉ ÄÅÒÅ×Ï"
 
-#: src/bar.c:222
+#: src/bar.c:226
 #, fuzzy
 msgid "_Refresh Tree"
 msgstr "ïÎÏ×ÉÔÉ ÄÅÒÅ×Ï"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 #, fuzzy
 msgid "S_canner"
 msgstr "óËÁÎÅÒ"
 
-#: src/bar.c:225
+#: src/bar.c:229
 #, fuzzy
 msgid "_Fill Tag(s) ..."
 msgstr "/óËÁÎÅÒ/úÁÐÏ×ÎÉÔÉ ÔÅÇÉ..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 #, fuzzy
 msgid "Fill Tag(s) ..."
 msgstr "/óËÁÎÅÒ/úÁÐÏ×ÎÉÔÉ ÔÅÇÉ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 #, fuzzy
 msgid "_Rename File(s) and Directory ..."
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ËÁÔÁÌÏÇÁ"
 
-#: src/bar.c:226
+#: src/bar.c:230
 #, fuzzy
 msgid "Rename File(s) and Directory ..."
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ËÁÔÁÌÏÇÁ"
 
-#: src/bar.c:227
+#: src/bar.c:231
 #, fuzzy
 msgid "_Process Field(s) ..."
 msgstr "ïÂÒÏÂËÁ ÐÏ̦×"
 
-#: src/bar.c:227
+#: src/bar.c:231
 #, fuzzy
 msgid "Process Fields(s) ..."
 msgstr "ïÂÒÏÂËÁ ÐÏ̦×"
 
-#: src/bar.c:229
+#: src/bar.c:233
 #, fuzzy
 msgid "_Misc"
 msgstr "/ò¦ÚÎÅ"
 
-#: src/bar.c:230
+#: src/bar.c:234
 #, fuzzy
 msgid "Search _File(s) ..."
 msgstr "ðÏÛÕË ÆÁÊ̦×..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 #, fuzzy
 msgid "Search File(s)..."
 msgstr "ðÏÛÕË ÆÁÊ̦×..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 #, fuzzy
 msgid "CD Data _Base Search ..."
 msgstr "ðÏÛÕË × CDDB"
 
-#: src/bar.c:231
+#: src/bar.c:235
 #, fuzzy
 msgid "CDDB Search ..."
 msgstr "ðÏÛÕË × CDDB"
 
-#: src/bar.c:232
+#: src/bar.c:236
 #, fuzzy
 msgid "Load Filenames from TXT ..."
 msgstr "/ò¦ÚÎÅ/úÁ×ÁÎÔÁÖÉÔÉ ¦ÍÅÎÁ ÆÁÊÌ¦× Ú ÔÅËÓÔÏ×ÏÇÏ ÆÁÊÌÁ..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 #, fuzzy
 msgid "Write Playlist ..."
 msgstr "úÁÐÉÓ ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÐÒÏÇÒÁ×ÁÞ"
 
-#: src/bar.c:236
+#: src/bar.c:240
 #, fuzzy
 msgid "_Settings"
 msgstr "/îÁÓÔÒÏÊËÉ"
 
-#: src/bar.c:237
+#: src/bar.c:241
 #, fuzzy
 msgid "_Preferences ..."
 msgstr "ðÁÒÁÍÅÔÒÉ..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 #, fuzzy
 msgid "Preferences ..."
 msgstr "ðÁÒÁÍÅÔÒÉ..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 #, fuzzy
 msgid "_Help"
 msgstr "/äÏÐÏÍÏÇÁ"
 
-#: src/bar.c:240
+#: src/bar.c:244
 #, fuzzy
 msgid "_About"
 msgstr "ðÒÏ"
@@ -790,51 +802,51 @@ msgstr "
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "úÕÐÉÎÉÔÉ ÐÏÔÏÞÎÕ Ä¦À"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 #, fuzzy
 msgid "_File Operations"
 msgstr "ðÁÒÁÍÅÔÒÉ ¦ÍÅÎ ÆÁÊ̦×"
 
-#: src/bar.c:257
+#: src/bar.c:261
 #, fuzzy
 msgid "CDDB Search File(s)..."
 msgstr "ðÏÛÕË ÆÁÊ̦×..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr ""
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 #, fuzzy
 msgid "Browse _Sub-directories"
 msgstr "ðÅÒÅÇÌÑÄÁÔÉ Ð¦ÄËÁÔÁÌÏÇÉ"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 #, fuzzy
 msgid "Show Hidden Directories"
 msgstr "ûÕËÁÔÉ × Ð¦ÄËÁÔÁÌÏÇÁÈ"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr ""
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr ""
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "çÏÔÏ×ÉÊ ÄÏ ÒÏÂÏÔÉ..."
 
@@ -843,7 +855,7 @@ msgid "New default path for files selected"
 msgstr "÷ÉÂÒÁÎÏ ÎÏ×ÉÊ ÔÉÐÏ×ÉÊ ÛÌÑÈ"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ..."
 
@@ -855,93 +867,98 @@ msgstr ""
 "äÅÑ˦ ÆÁÊÌÉ ÚͦÎÅÎÏ, ÁÌÅ ÎÅ ÚÁÐÉÓÁÎÏ...\n"
 "÷É Â ÈÏÔ¦ÌÉ ÚÂÅÒÅÇÔÉ ÚͦÎÉ ÐÅÒÅÄ ×ÉÈÏÄÏÍ Ú ËÁÔÁÌÏÇÕ?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 #, fuzzy
 msgid "<All albums>"
 msgstr "áÌØÂÏÍ"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr ""
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "¶Í'Ñ ÆÁÊÌÁ"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "úÁÇÏÌÏ×ÏË"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "÷ÉËÏÎÁ×ÅÃØ"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "÷ÉËÏÎÁ×ÅÃØ"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "áÌØÂÏÍ"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "ò¦Ë"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "ôÒÅË N"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "óÔÉÌØ"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 #, fuzzy
 msgid "Composer"
 msgstr "%c : ËÏÍÅÎÔÁÒ"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 #, fuzzy
 msgid "Orig. Artist"
 msgstr "÷ÉËÏÎÁ×ÅÃØ:"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr ""
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr ""
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "ëÏÄÕ×ÁÌØÎÉË:"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 #, fuzzy
 msgid "# Albums"
 msgstr "áÌØÂÏÍ"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 #, fuzzy
 msgid "# Files"
 msgstr "æÁÊÌ"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 #, fuzzy
 msgid "Go to parent directory"
 msgstr "ðÅÒÅÊÔÉ × ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "úÁÄÁÊÔÅ ËÁÔÁÌÏÇ ÄÌÑ ÐÅÒÅÇÌÑÄÕ."
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "÷ÉÂÅÒ¦ÔØ ËÁÔÁÌÏÇ ÄÌÑ ÐÅÒÅÇÌÑÄÕ!"
@@ -949,65 +966,65 @@ msgstr "
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u ÆÁÊÌ(¦×)"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 #, fuzzy
 msgid "Artist & Album"
 msgstr "÷ÉËÏÎÁ×ÅÃØ / áÌØÂÏÍ"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ËÁÔÁÌÏÇÁ"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ËÁÔÁÌÏÇ '%s' ÎÁ: "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "úÁ ÍÁÓËÏÀ: "
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
 msgstr ""
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "îÅËÏÒÅËÔÎÁ ÍÁÓËÁ ÄÌÑ ÓËÁÎÅÒÁ"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "ðÏÐÅÒÅÄÎ¦Ê ×ÉÇÌÑÄ: ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÆÁÊÌÁ..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "ðÏÍÉÌËÁ..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "óÌ¦Ä ××ÅÓÔÉ ¦Í'Ñ ËÁÔÁÌÏÇÕ!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -1040,7 +1057,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -1049,7 +1066,7 @@ msgstr ""
 "îÅ ÍÏÖÕ ÐÅÒÅÊÍÅÎÕ×ÁÔÉ, ÏÓ˦ÌØËÉ ÔÁËÉÊ ËÁÔÁÌÏÇ ×ÖÅ ¤!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -1064,69 +1081,69 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "ëÁÔÁÌÏÇ ÐÅÒÅÊÍÅÎÏ×ÁÎÏ"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "÷ÉËÏÎÁÔÉ ÐÒÏÇÒÁÍÕ: "
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "÷×ÅĦÔØ ¦Í'Ñ ÐÒÏÇÒÁÍÉ. ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ ÂÕÄÅ §§ ÐÁÒÁÍÅÔÒÏÍ."
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "÷¦ÄËÒÉÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "÷×ÅĦÔØ ¦Í'Ñ ÐÒÏÇÒÁÍÉ. ðÏÔÏÞÎÉÊ ÆÁÊÌ ÂÕÄÅ §§ ÐÁÒÁÍÅÔÒÏÍ."
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "óÌ¦Ä ××ÅÓÔÉ ¦Í'Ñ ÐÒÏÇÒÁÍÉ!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "îÅ×ÄÁ¤ÔØÓÑ ×ÉËÏÎÁÔÉ %s (%s)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "îÅ ÍÏÖÕ ÐÏÞÁÔÉ ¦ÎÛÉÊ ÐÒÏÃÅÓ!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "÷ÉËÏÎÁÎÁ ËÏÍÁÎÄÁ: '%s %s'"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "÷ÉËÏÎÁ×ÅÃØ / áÌØÂÏÍ"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "ëÁÔÅÇÏÒ¦Ñ"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "îÁÚ×Á ÔÒÅËÁ"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "þÁÓ"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 #, fuzzy
 msgid "CD Data Base Search"
 msgstr "ðÏÛÕË × CDDB"
@@ -1134,31 +1151,31 @@ msgstr "
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr ""
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr ""
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
 msgstr ""
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 #, fuzzy
 msgid "Stop the search ..."
 msgstr "  úõðéîéôé ÐÏÛÕË...  "
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1167,139 +1184,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 #, fuzzy
 msgid "Manual Search"
 msgstr " ûÕËÁÔÉ "
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "óÌÏ×Á: "
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "÷×ÅĦÔØ ÓÌÏ×Á ÄÌÑ ÐÏÛÕËÕ (ÒÏÚĦÌÅΦ ÐÒÏÐÕÓËÏÍ ÁÂÏ '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "äÅ ÛÕËÁÔÉ: "
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "÷Ó¦ ÐÏÌÑ"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "¶ÎÛÅ"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "÷Ó¦ ËÁÔÅÇÏÒ¦§"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "âÌÀÚ"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "ëÌÁÓÉËÁ"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "ëÁÎÔÒ¦"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "îÁÒÏÄÎÁ"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "äÖÁÚ"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "ò¦ÚÎÅ"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "îÏ×Á È×ÉÌÑ"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "òÅÇǦ"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "òÏË"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "óÁÕÎÄÔÒÅ"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "×ËÌÀÞÎÏ: ÆÁÎË, ÓÏÕÌ, ÒÅÐ, ÐÏÐ, ¦ÎÄÁÓÔÒ¦ÁÌ, ÍÅÔÁÌ, ÔÏÝÏ."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "ƦÌØÍÉ, ÔÅÌÅÛÏÕ"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "Ô¦, ÝÏ ÎÅ ÎÁÌÅÖÁÔØ ÖÏÄÎ¦Ê Ú ÐÅÒÅÒÁÈÏ×ÁÎÉÈ ËÁÔÅÇÏÒ¦Ê"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " ëÁÔÅÇÏÒ¦§ "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "òÅÚÕÌØÔÁÔÉ: "
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "ðÏÛÕË:"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "÷×ÅĦÔØ ÓÌÏ×Á ÄÌÑ ÐÏÛÕËÕ × ÓÐÉÓËÕ"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "ûÕËÁÔÉ ÎÁÓÔÕÐÎÉÊ"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "ûÕËÁÔÉ ÐÏÐÅÒÅÄΦÊ"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "óËÁÓÕ×ÁÔÉ ×ɦÒËÕ"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 #, fuzzy
 msgid "Invert lines selection"
 msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ɦÒËÕ"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "÷ÉÂÒÁÔÉ ×Ó¦ ÒÑÄËÉ"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1309,36 +1326,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "÷ÉÓÔÁ×ÉÔÉ ÑË:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "÷Ó¦"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "ôÒÅË N"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "ôÒÅ˦×"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr ""
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1347,94 +1364,98 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "çÏÔÏ×ÉÊ ÄÏ ÐÏÛÕËÕ..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
-"áÌØÂÏÍ: '%s', ×ÉËÏÎÁ×ÅÃØ: '%s', ÄÏ×ÖÉÎÁ: '%s', Ò¦Ë: '%s', ÖÁÎÒ: '%s', ID: '%"
-"s'"
+"áÌØÂÏÍ: '%s', ×ÉËÏÎÁ×ÅÃØ: '%s', ÄÏ×ÖÉÎÁ: '%s', Ò¦Ë: '%s', ÖÁÎÒ: '%s', ID: "
+"'%s'"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ɦÒËÕ"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 #, fuzzy
 msgid "Sort by Track Number"
 msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÚÒÏÓÔÁÎÎÑÍ ÎÏÍÅÒÁ ÔÒÅËÁ"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 #, fuzzy
 msgid "Sort by Track Name"
 msgstr "îÁÚ×Á ÔÒÅËÁ"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "÷ÉÚÎÁÞÅÎÎÑ ¦ÍÅΦ ÈÏÓÔÁ '%s'..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "îÅ ÍÏÖÕ ×ÉÚÎÁÞÉÔÉ ¦Í'Ñ ÈÏÓÔÁ '%s' (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ÓÏËÅÔ (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "ð¦Ä'¤ÄÎÁÎÎÑ Ú '%s', ÐÏÒÔ '%d'..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "îÅ ÍÏÖÕ Ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ '%s' (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "ð¦Ä'¤ÄÎÁÎÏ ÄÏ '%s'"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÄÁÎÉÈ (%s)..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "ðÏÍÉÌËÁ ×ÉÄÁÌÅÎÎÑ ÔÅÇÕ ID3v1 Ú '%s' (%s)."
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ '%s' (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ '%s' (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "îÁÄÓÉÌÁÎÎÑ ÚÁÐÉÔÕ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "îÅ ÍÏÖÕ ÎÁĦÓÌÁÔÉ ÚÁÐÉÔ (%s)!"
@@ -1443,92 +1464,93 @@ msgstr "
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÄÁÎÉÈ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "îÅÐÒÁ×ÉÌØÎÁ צÄÐÏצÄØ ÓÅÒ×ÅÒÁ! (%s)"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "îÅÐÒÁ×ÉÌØÎÁ צÄÐÏצÄØ ÓÅÒ×ÅÒÁ! (%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "úÎÁÊÄÅÎÏ %d ÁÌØÂÏÍÉ(¦×)"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÄÁÎÉÈ (%s)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "ïÔÒÉÍÁÎÎÑ ÄÁÎÉÈ (%s)..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 #, fuzzy
 msgid "No file selected!"
 msgstr "îÅ ×ÉÂÒÁÎÏ ÒÑÄÏË!\n"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%u ÆÁÊÌ(¦×)"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 #, fuzzy
 msgid "Local CD search..."
 msgstr "çÏÔÏ×ÉÊ ÄÏ ÐÏÛÕËÕ..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
 "Fill it in the preferences window before to use this search."
 msgstr ""
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "úÎÁÊÄÅÎÏ %d ÁÌØÂÏÍÉ(¦×)"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÓÐÉÓËÕ ÔÒÅË¦× ÁÌØÂÏÍÕ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, fuzzy, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1540,7 +1562,7 @@ msgstr ""
 "\n"
 "ðÒÏÄÏ×ÖÉÔÉ?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "úÁÐÉÓ ÔÅÇÕ ÚÁ ÄÁÎÉÍÉ CDDB..."
 
@@ -1799,7 +1821,7 @@ msgstr ""
 msgid "Browser"
 msgstr "ðÅÒÅÇÌÑÄÁÞ"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "æÁÊÌ"
 
@@ -1813,11 +1835,11 @@ msgstr "
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1825,7 +1847,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "â¦ÔÒÅÊÔ:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? ëÂ/Ó"
 
@@ -1833,17 +1855,17 @@ msgstr "? 
 msgid "Freq:"
 msgstr "þÁÓÔÏÔÁ:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? çÃ"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "ôÉÐ:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1860,7 +1882,7 @@ msgid "Time:"
 msgstr "þÁÓ:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "ôÅÇ"
 
@@ -1891,75 +1913,86 @@ msgstr "
 msgid "Tag selected files with this artist"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ×ÉËÏÎÁ×ÃÅÍ"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "÷ÉËÏÎÁ×ÅÃØ:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ×ÉËÏÎÁ×ÃÅÍ"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "áÌØÂÏÍ:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 #, fuzzy
 msgid "Tag selected files with this album name"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÎÁÚ×ÏÀ ÃØÏÇÏ ÁÌØÂÏÍÕ"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 #, fuzzy
 msgid "CD:"
 msgstr "CDDB"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 #, fuzzy
 msgid "Tag selected files with this disc number"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ËÏÍÅÎÔÁÒÅÍ"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "ò¦Ë:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 #, fuzzy
 msgid "Tag selected files with this year"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ÒÏËÏÍ"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 #, fuzzy
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "ðÒÏÎÕÍÅÒÕ×ÁÔÉ ×Ó¦ ÔÒÅËÉ. ðÏÞÉÎÁÔÉ Ú 01 × ËÏÖÎÏÍÕ Ð¦ÄËÁÔÁÌÏÚ¦."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "ôÒÅË N:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 #, fuzzy
 msgid "Tag selected files with this number of tracks"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ÖÅ ÎÏÍÅÒÏÍ ÔÒÅËÕ"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "óÔÉÌØ:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 #, fuzzy
 msgid "Tag selected files with this genre"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ÖÅ ÓÔÉÌÅÍ"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "ëÏÍÅÎÔÁÒ:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 #, fuzzy
 msgid "Tag selected files with this comment"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ËÏÍÅÎÔÁÒÅÍ"
@@ -1967,53 +2000,53 @@ msgstr "
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr ""
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 #, fuzzy
 msgid "Tag selected files with this composer"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ËÏÍÅÎÔÁÒÅÍ"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 #, fuzzy
 msgid "Orig. Artist:"
 msgstr "÷ÉËÏÎÁ×ÅÃØ:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 #, fuzzy
 msgid "Tag selected files with this original artist"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ×ÉËÏÎÁ×ÃÅÍ"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr ""
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 #, fuzzy
 msgid "Tag selected files with this copyright"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ×ÉËÏÎÁ×ÃÅÍ"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr ""
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 #, fuzzy
 msgid "Tag selected files with this URL"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ÒÏËÏÍ"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 #, fuzzy
 msgid "Encoded by:"
 msgstr "ëÏÄÕ×ÁÌØÎÉË:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 #, fuzzy
 msgid "Tag selected files with this encoder name"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÃÉÍ ÖÅ ÓÔÉÌÅÍ"
@@ -2021,236 +2054,245 @@ msgstr "
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr ""
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr ""
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr ""
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 #, fuzzy
 msgid "Tag selected files with these pictures"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÔÁËÉÍ ÚÁÇÏÌÏ×ËÏÍ"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 #, fuzzy
 msgid "Remove selected pictures, else all pictures."
 msgstr "÷ÉÄÁÌÉÔÉ ÔÅÇ Ú ×ÉĦÌÅÎÉÈ ÆÁÊ̦×"
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 #, fuzzy
 msgid "Save the selected pictures on the hard disk."
 msgstr "ëÏÄÕ×ÁÎÎÑ, ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ Õ ÆÁÊÌÁÈ ÎÁ ÄÉÓËÕ."
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 #, fuzzy
 msgid "Set properties of the selected pictures."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÚÁÇÏÌÏ×ËÏÍ '%s'."
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, fuzzy, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÚÁÇÏÌÏ×ËÏÍ '%s'."
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 #, fuzzy
 msgid "Removed title from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ÚÁÇÏÌÏ×ËÉ."
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, fuzzy, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ×ÉËÏÎÁ×ÃÅÍ '%s'."
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 #, fuzzy
 msgid "Removed artist from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ×ÉËÏÎÁ×ÃÑ."
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ×ÉËÏÎÁ×ÃÅÍ '%s'."
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ×ÉËÏÎÁ×ÃÑ."
+
+#: src/easytag.c:1257
 #, fuzzy, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÎÁÚ×ÏÀ ÁÌØÂÏÍÕ '%s'."
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 #, fuzzy
 msgid "Removed album name from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ÎÁÚ×Õ ÁÌØÂÏÍÕ."
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, fuzzy, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ËÏÍÅÎÔÁÒÅÍ '%s'."
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 #, fuzzy
 msgid "Removed disc number from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ÎÏÍÅÒ ÔÒÅËÕ."
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, fuzzy, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ '%s' ÒÏËÏÍ."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 #, fuzzy
 msgid "Removed year from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ Ò¦Ë ËÏÍÐÏÚÉæ§."
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, fuzzy, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÎÏÍÅÒÏÍ ÔÒÅËÕ ÎÁ ÚÒÁÚÏË 'xx/%s'."
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 #, fuzzy
 msgid "Selected files tagged with track like 'xx'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÎÏÍÅÒÏÍ ÔÒÅËÕ ÎÁ ÚÒÁÚÏË 'xx'."
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 #, fuzzy
 msgid "Removed track number from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ÎÏÍÅÒ ÔÒÅËÕ."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 #, fuzzy
 msgid "Selected tracks numbered sequentially."
 msgstr "ðÒÏÎÕÍÅÒÏ×ÁÎÏ ÔÒÅ˦×: %d."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, fuzzy, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÓÔÉÌÅÍ '%s'."
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 #, fuzzy
 msgid "Removed genre from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ÓÔÉÌØ ÔÒÅ˦×."
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, fuzzy, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ËÏÍÅÎÔÁÒÅÍ '%s'."
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 #, fuzzy
 msgid "Removed comment from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ËÏÍÅÎÔÁÒ¦."
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, fuzzy, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ËÏÍÅÎÔÁÒÅÍ '%s'."
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 #, fuzzy
 msgid "Removed composer from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ËÏÍÅÎÔÁÒ¦."
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, fuzzy, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ×ÉËÏÎÁ×ÃÅÍ '%s'."
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 #, fuzzy
 msgid "Removed original artist from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ×ÉËÏÎÁ×ÃÑ."
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, fuzzy, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ×ÉËÏÎÁ×ÃÅÍ '%s'."
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 #, fuzzy
 msgid "Removed copyright from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ×ÉËÏÎÁ×ÃÑ."
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, fuzzy, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ '%s' ÒÏËÏÍ."
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 #, fuzzy
 msgid "Removed URL from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ Ò¦Ë ËÏÍÐÏÚÉæ§."
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, fuzzy, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÓÔÉÌÅÍ '%s'."
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 #, fuzzy
 msgid "Removed encoder name from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ÓÔÉÌØ ÔÒÅ˦×."
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 #, fuzzy
 msgid "Selected files tagged with pictures."
 msgstr "÷Ó¦ ÆÁÊÌÉ ÐÒÏÂÉÒËÏ×ÁÎÏ ÚÁÇÏÌÏ×ËÏÍ '%s'."
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 #, fuzzy
 msgid "Removed pictures from selected files."
 msgstr "ú ÕÓ¦È ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ ÚÁÇÏÌÏ×ËÉ."
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "÷ÉÂÅÒ¦ÔØ ÒÅÖÉÍ ÔÁ ÍÁÓËÕ, ÔÁ ÐÏ×ÔÏÒ¦ÔØ Ã¦ Ö Ä¦§"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "ðÒÏÓËÁÎÏ×ÁÎÏ ×Ó¦ ÔÅÇÉ"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "÷Ó¦ ÔÅÇÉ ×ÉÄÁÌÅÎÏ..."
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "ðÏÛÕË ÆÁÊ̦×..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "÷Ó¦ ÔÅÇÉ ÚÁÐÉÓÁÎÏ..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "þÁÓÔÉÎÕ ÆÁÊÌ¦× ×ÉÄÁÌÅÎÏ..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "÷Ó¦ ÆÁÊÌÉ ×ÉÄÁÌÅÎÏ..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2259,17 +2301,17 @@ msgstr ""
 "÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ÚÁÐÉÓÁÔÉ ÔÅÇ Õ ÆÁÊÌ\n"
 "'%s' ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "úÁÐÉÓ ÔÅÇÕ..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 #, fuzzy
 msgid "Rename File and Directory..."
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ËÁÔÁÌÏÇÁ"
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2283,12 +2325,12 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ËÁÔÁÌÏÇ..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2302,11 +2344,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÆÁÊÌ..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2319,17 +2361,17 @@ msgstr ""
 "ÎÁ \n"
 "'%s' ?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "úÁÐÉÓ ÔÅÇÕ ÄÏ '%s'"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "ôÅÇ ÚÁÐÉÓÁÎÏ"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2338,21 +2380,21 @@ msgstr ""
 "îÅ ÍÏÖÕ ÐÒÏÂÉÒËÕ×ÁÔÉ ÆÁÊÌ '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "îÅ ÍÏÖÕ ÐÒÏÂÉÒËÕ×ÁÔÉ ÆÁÊÌ '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÆÁÊÌÁ '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2365,7 +2407,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2374,11 +2416,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "æÁÊÌÉ ÎÅ ÐÅÒÅÊÍÅÎÏ×ÁÎÏ..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2391,7 +2433,7 @@ msgstr ""
 "ÏÓ˦ÌØËÉ ×ÖÅ ¦ÓÎÕ¤ ÆÁÊÌ Ú ÔÁËÉÍ ¦ÍÅÎÅÍ:\n"
 "'%s'"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2400,7 +2442,7 @@ msgstr ""
 "ÏÓ˦ÌØËÉ ×ÖÅ ¦ÓÎÕ¤ ÆÁÊÌ Ú ÔÁËÉÍ ¦ÍÅÎÅÍ:\n"
 "'%s'"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, fuzzy, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2411,7 +2453,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2420,16 +2462,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "'%s' ÐÅÒÅÊÍÅÎÏ×ÁÎÏ × '%s'"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "æÁÊÌÉ ÐÅÒÅÊÍÅÎÏ×ÁÎÏ..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2440,7 +2482,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2449,18 +2491,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "'%s' ÐÅÒÅÊÍÅÎÏ×ÁÎÏ × '%s'"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "æÁÊÌÉ ÐÅÒÅÊÍÅÎÏ×ÁÎÏ..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2473,7 +2515,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2482,12 +2524,12 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "æÁÊÌÉ ÎÅ ÐÅÒÅÊÍÅÎÏ×ÁÎÏ..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2496,16 +2538,16 @@ msgstr ""
 "÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ×ÉÄÁÌÉÔÉ ÆÁÊÌ\n"
 "'%s' ?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "÷ÉÄÁÌÅÎÎÑ ÆÁÊ̦×..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "æÁÊÌ '%s' ×ÉÄÁÌÅÎÏ"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2517,110 +2559,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "ôÒÉ×Á¤ ÐÏÛÕË..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "æÁÊÌ: '%s'"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "ë¦ÌØ˦ÓÔØ ÚÎÁÊÄÅÎÉÈ ÆÁÊÌ¦× Õ ÃØÏÍÕ ËÁÔÁÌÏÚ¦ ÔÁ ЦÄËÁÔÁÌÏÇÁÈ: %d"
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "ë¦ÌØ˦ÓÔØ ÚÎÁÊÄÅÎÉÈ ÆÁÊÌ¦× Õ ÃØÏÍÕ ËÁÔÁÌÏÚ¦: %d"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u ÆÁÊÌ(¦×)"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "÷ ÃØÏÍÕ ËÁÔÁÌÏÚ¦ ÔÁ ÊÏÇÏ Ð¦ÄËÁÔÁÌÏÇÁÈ ÎÅÍÁ¤ ÆÁÊÌ¦× MP3!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "÷ ÃØÏÍÕ ËÁÔÁÌÏÚ¦ ÎÅÍÁ¤ ÆÁÊÌ¦× Ú ÍÕÚÉËÏÀ!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "ðÏÛÕË..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  úõðéîéôé ÐÏÛÕË...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "÷ÉÂÅÒ¦ÔØ ËÁÔÁÌÏÇ ÄÌÑ ÐÅÒÅÇÌÑÄÕ!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 #, fuzzy
 msgid "Tag selected files with this field"
 msgstr "ðÒÏÂÉÒËÕ×ÁÔÉ ×Ó¦ ÆÁÊÌÉ ÔÁËÉÍ ÚÁÇÏÌÏ×ËÏÍ"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "úÁͦÎÀ×ÁÔÉ '_' ÔÁ '%20' ÎÁ ÐÒϦÌÉ"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "úÁͦÎÀ×ÁÔÉ ' ' ÎÁ '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "÷åìéëéíé ì¶ôåòáíé"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "ÍÁÌÉÍÉ Ì¦ÔÅÒÁÍÉ"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "ú ×ÅÌÉËϧ ̦ÔÅÒÉ"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "ú ÷ÅÌÉËϧ ì¦ÔÅÒÉ ëÏÖÎÅ óÌÏ×Ï"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "÷ÉÄÁÌÉÔÉ ÐÒϦÌÉ"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "÷ÓÔÁ×ÉÔÉ ÐÒÏÂ¦Ì ÐÅÒÅÄ ÷ÅÌÉËÏÀ ̦ÔÅÒÏÀ"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "÷ÉÄÁÌÉÔÉ ÄÕÂÌØÏ×ÁΦ ÐÒϦÌÉ ÔÁ ЦÄËÒÅÓÌÅÎÎÑ"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: îÅÎÏÒÍÁÌØÎÅ ÚÁ×ÅÒÛÅÎÎÑ (PId: %d)!."
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "ïÔÒÉÍÁÎÏ ÓÉÇÎÁÌ %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2631,11 +2672,11 @@ msgstr ""
 "ÔÒÁÓÕ×ÁÎÎÑ gdb ('gdb easytag core' ÐÏÔ¦Í 'bt') ÎÁ ÁÄÒÅÓÕ j.couderc at ifrance."
 "com\n"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "îÅצÄÏÍÉÊ ÓÉÇÎÁÌ"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2668,11 +2709,11 @@ msgstr ""
 "., ./             ÞÉ ÚÁ×ÁÎÔÁÖÉÔÉ ÐÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ.\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: îÏÒÍÁÌØÎÅ ÚÁ×ÅÒÛÅÎÎÑ."
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2680,86 +2721,86 @@ msgstr ""
 "äÅÑ˦ ÆÁÊÌÉ ÚͦÎÅÎÏ, ÁÌÅ ÎÅ ÚÁÐÉÓÁÎÏ...\n"
 "÷É Â ÈÏÔ¦ÌÉ ÚÂÅÒÅÇÔÉ ÚͦÎÉ ÐÅÒÅÄ ×ÉÈÏÄÏÍ Ú ÐÒÏÇÒÁÍÉ?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " ÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ×ÉÊÔÉ Ú ÐÒÏÇÒÁÍÉ? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ôÅÇ ID3"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "ôÅÇ OGG Vorbis"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 #, fuzzy
 msgid "FLAC Vorbis Tag"
 msgstr "ôÅÇ OGG Vorbis"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "ôÅÇ APE"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "æÁÊÌ MP3"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "æÁÊÌ MP2"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "æÁÊÌ OGG Vorbis"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 #, fuzzy
 msgid "Speex File"
 msgstr "/æÁÊÌ/îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "æÁÊÌ FLAC"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "æÁÊÌ MusePack"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "æÁÊÌ Monkey's Audio"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "æÁÊÌ MP2"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 #, fuzzy
 msgid "Wavpack File"
 msgstr "æÁÊÌ MusePack"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr ""
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2767,14 +2808,14 @@ msgid "%d kb/s"
 msgstr "%d ëÂ/c"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d çÃ"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2782,12 +2823,12 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 #, fuzzy
 msgid "Filename translation"
 msgstr "ðÁÒÁÍÅÔÒÉ ¦ÍÅÎ ÆÁÊ̦×"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2811,54 +2852,54 @@ msgstr "
 msgid "Channels:"
 msgstr "ëÁÎÁÌÉ:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "ðïíéìëá צÄËÒÉÔÔÑ ÆÁÊÌÁ: '%s' (%s)."
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ðïíéìëá: îÅ×ÄÁÞÁ ÚÁÐÉÓÕ ËÏÍÅÎÔÁÒÑ Õ ÆÁÊÌ '%s' (%s)."
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "úÁÐÉÓÁÎÏ ÔÅÇ Õ '%s'"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "÷ÉÄÁÌÅÎÏ ÔÅÇ Ú '%s'"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "ðÏÍÉÌËÁ ×ÉÄÁÌÅÎÎÑ ÔÅÇÕ ID3v1 Ú '%s' (%s)."
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "ðÏÍÉÌËÁ ×ÉÄÁÌÅÎÎÑ ÔÅÇÕ ID3v2 Ú '%s' (%s)."
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "ðÏÍÉÌËÁ ÐÏÎÏ×ÌÅÎÎÑ ÔÅÇÕ ID3v1 Õ '%s' (%s)."
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2873,84 +2914,84 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "ðÏÍÉÌËÁ ÐÏÎÏ×ÌÅÎÎÑ ÔÅÇÕ ID3v1 Õ '%s' (%s)."
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "ðÏÎÏ×ÌÅÎÏ ÔÅÇ Õ '%s'"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "öÏÄÎϧ ÐÏÍÉÌËÉ"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "îÅÄÏÓÔÁÔÎØÏ ÐÁÍ'ÑÔ¦"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "äÁΦ צÄÓÕÔΦ"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "îÅÐÒÁ×ÉÌØÎÉÊ ÆÏÒÍÁÔÉ ÄÁÎÉÈ"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "÷¦ÄÓÕÔÎ¦Ê ÂÕÆÅÒ ÚÁÐÉÓÕ"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "úÁÍÁÌÉÊ ÂÕÆÅÒ"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "îÅÐÒÁ×ÉÌØÎÉÊ ID ËÁÄÒÕ"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ×¦ÄÐÏצÄÎÅ ÐÏÌÅ"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "îÅצÄÏÍÉÊ ÔÉÐ ÐÏÌÑ"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "ôÅÇ ×ÖÅ ÄÏÄÁÎÏ ÄÏ ÆÁÊÌÁ"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "îÅצÒÎÁ ×ÅÒÓ¦Ñ ÔÅÇÕ"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "îÅ ÚÁÄÁÎÏ ÆÁÊÌ"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "óÐÒÏÂÁ ÚÁÐÉÓÕ × ÆÁÊÌ 'ÌÉÛÅ ÄÌÑ ÚÁÐÉÓÕ'"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "ðÏÍÉÌËÁ ËÏÍÐÒÅÓ¦§/ÄÅËÏÍÐÒÅÓ¦§"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "÷ÉÂÒÁÔÉ ÆÁÊÌ..."
@@ -2959,126 +3000,126 @@ msgstr "
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "÷ÉÂÒÁÔÉ ÆÁÊÌ..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "÷ÉÂÅÒ¦ÔØ ËÁÔÁÌÏÇ..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 #, fuzzy
 msgid "Warning..."
 msgstr "ðÏÛÕË..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "îÅ×ÄÁ¤ÔØÓÑ ×ÉËÏÎÁÔÉ %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "Â"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "ëÂ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "íÂ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "çÂ"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "ôÂ"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "óÔ×ÏÒÅÎÎÑ ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "¶Í'Ñ ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ M3U"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "úÁ ¦ÍÅÎÅÍ ËÁÔÁÌÏÇÁ"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "òÅÄÁÇÕ×ÁÔÉ íÁÓËÉ"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "ðÁÒÁÍÅÔÒÉ ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 #, fuzzy
 msgid "Include only the selected files"
 msgstr "óËÁÓÕ×ÁÔÉ ÏÓÔÁÎΦ ÚͦÎÉ Õ ×ÉĦÌÅÎÉÈ ÆÁÊÌÁÈ"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "ðÏ×ÎÉÊ ÛÌÑÈ × ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "÷¦ÄÎÏÓÎÉÊ ÛÌÑÈ × ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "ó×ÏÒÉÔÉ ÓÐÉÓÏË ×¦ÄÔ×ÏÒÅÎÎÑ Õ ÐÏÔÏÞËÎÏÍÕ ËÁÔÁÌÏÚ¦"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÒÏÚĦÌØÎÉË ËÁÔÁÌÏÇ¦× DOS"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "úͦÓÔ ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "úÁÐÉÓÕ×ÁÔÉ ÌÉÛÅ ÓÐÉÓÏË ÆÁÊ̦×"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "úÁÐÉÓÕ×ÁÔÉ ¦ÎÆÏÒÍÁæÀ ÚǦÄÎÏ Ú ¦ÍÅÎÅÍ ÆÁÊÌÁ"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "úÁÐÉÓÕ×ÁÔÉ ¦ÎÆÏÒÍÁæÀ ÚǦÄÎÏ Ú: "
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -3087,12 +3128,12 @@ msgstr ""
 "CÐÉÓÏË ×¦ÄÔ×ÏÒÅÎÎÑ '%s' ×ÖÅ ¦ÓÎÕ¤!\n"
 "ðÅÒÅÚÁÐÉÓÁÔÉ?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "úÁÐÉÓ ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -3101,139 +3142,139 @@ msgstr ""
 "îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÓÐÉÓÏË ×¦ÄÔ×ÏÒÅÎÎÑ '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "úÁÐÉÓÁÎÏ ÓÐÉÓÏË ×¦ÄÔ×ÏÒÅÎÎÑ '%s'"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 #, fuzzy
 msgid "CD"
 msgstr "CDDB"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 #, fuzzy
 msgid "Encoded by"
 msgstr "ëÏÄÕ×ÁÌØÎÉË:"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "úÎÁÊÔÉ ÆÁÊÌ"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "äÅ:"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 #, fuzzy
 msgid "the File Name"
 msgstr "¶Í'Ñ ÆÁÊÌÁ"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 #, fuzzy
 msgid "the Tag"
 msgstr "úÁÐÉÓ ÔÅÇÕ..."
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "òÅ­¦ÓÔÒÏ-ÚÁÌÅÖÎÉÊ"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "úÎÁÊÄÅÎÏ: %d ÆÁÊÌ(¦×)"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÓÐÉÓÏË ÆÁÊÌ¦× Ú ÔÅËÓÔÏ×ÏÇÏ ÆÁÊÌÁ"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "æÁÊÌ :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " úÁ×ÁÎÔÁÖÉÔÉ "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÆÁÊÌÁ"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "÷ÓÔÁ×ÉÔÉ ÐÒÏÐÕÓË ÐÅÒÅÄ ÷ÅÌÉËÏÀ ̦ÔÅÒÏÀ"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "÷ÉÄÁÌÉÔÉ ÃÅÊ ÒÑÄÏË"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "÷ÉÄÁÌÉÔÉ ×Ó¦ ÐÏÒÏÖΦ ÒÑÄËÉ"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "óËÁÓÕ×ÁÔÉ ÏÓÔÁÎΦ ÚͦÎÉ Õ ×ÉĦÌÅÎÉÈ ÆÁÊÌÁÈ"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "óËÁÓÕ×ÁÔÉ ÏÓÔÁÎΦ ÚͦÎÉ Õ ×ÉĦÌÅÎÉÈ ÆÁÊÌÁÈ"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "ðÅÒÅÞÉÔÁÔÉ"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "úÁÐÉÓÕ×ÁÔÉ ÌÉÛÅ ÓÐÉÓÏË ÆÁÊ̦×"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "÷ÉÂÒÁÔÉ ×Ó¦ ÒÑÄËÉ"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
 msgstr ""
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "÷ÓÔÁ×ÉÔÉ ÐÏÒÏÖÎ¦Ê ÒÑÄÏË"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "÷ÉÄÁÌÉÔÉ ÃÅÊ ÒÑÄÏË"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "ð¦ÄÎÑÔÉ ÎÁ ÏÄÎÕ ÐÏÚÉæÀ"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "ïÐÕÓÔÉÔÉ ÎÁ ÏÄÎÕ ÐÏÚÉæÀ"
@@ -3315,12 +3356,12 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ðïíéìëá: îÅ×ÄÁÞÁ צÄËÒÉÔÔÑ ÆÁÊÌÁ: '%s' ÑË vorbis (%s)."
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr ""
@@ -3917,7 +3958,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3930,7 +3971,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -4080,24 +4121,35 @@ msgstr ""
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 #, fuzzy
 msgid "Character Set for writing ID3 tags"
 msgstr "ðÅÒÅËÏÄÕ×ÁÎÎÑ ÓÉÍ×Ï̦×"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 #, fuzzy
 msgid "ID3v2 tags"
 msgstr "âÉÒËÕ×ÁÔÉ ÔÅÇÏÍ ID3v2"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "âÉÒËÕ×ÁÔÉ ÔÅÇÏÍ ID3v2"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 #, fuzzy
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
@@ -4107,12 +4159,12 @@ msgstr ""
 "¶ÎÁËÛÅ ×ÏÎÉ ÂÕÄÕÔØ ÏÂÒ¦ÚÁΦ."
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 #, fuzzy
 msgid "Version:"
 msgstr "èÁÒÁËÔÅÒÉÓÔÉËÁ:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -4121,64 +4173,64 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr ""
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 #, fuzzy
 msgid "Unicode "
 msgstr "àΦËÏÄ (UTF-8)"
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 #, fuzzy
 msgid "Unicode type to use"
 msgstr "ëÏÄÕ×ÁÌØÎÉË:"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 #, fuzzy
 msgid "Character set used to write the tag data in the file."
 msgstr "ëÏÄÕ×ÁÎÎÑ, ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ÐÏËÁÚÕ ÔÅÇ¦× × ¦ÎÔÅÒÆÅÊÓ¦ ÐÒÏÇÒÁÍÉ."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 #, fuzzy
 msgid "No"
 msgstr "ÎÅÍÁ¤"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ôÅÇ ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "âÉÒËÕ×ÁÔÉ ÔÅÇÏÍ ID3v1.x"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4186,30 +4238,30 @@ msgstr ""
 "áËÔÉ×ÕÊÔÅ, ÝÏ ÄÏÄÁ×ÁÔÉ ÔÁ ÐÏÎÏ×ÌÀ×ÁÔÉ ÔÅÇÉ ID3v1 × Ë¦Îæ MP3-ÆÁÊ̦×. ¶ÎÁËÛÅ "
 "×ÏÎÉ ÂÕÄÕÔØ ÏÂÒ¦ÚÁΦ."
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "ëÏÄÕ×ÁÎÎÑ, ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ÐÏËÁÚÕ ÔÅÇ¦× × ¦ÎÔÅÒÆÅÊÓ¦ ÐÒÏÇÒÁÍÉ."
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "ðÅÒÅËÏÄÕ×ÁÎÎÑ ÓÉÍ×Ï̦×"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4218,7 +4270,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 #, fuzzy
 msgid "Character set used to read tag data in the file."
 msgstr "ëÏÄÕ×ÁÎÎÑ, ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ÐÏËÁÚÕ ÔÅÇ¦× × ¦ÎÔÅÒÆÅÊÓ¦ ÐÒÏÇÒÁÍÉ."
@@ -4226,55 +4278,55 @@ msgstr "
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "óËÁÎÅÒ"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 #, fuzzy
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "ôÁÂÌÉÃÑ ÐÅÒÅËÏÄÕ×ÁÎÎÑ"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "ëÏÎ×ÅÒÔÕ×ÁÔÉ ÓÉÍ×ÏÌ Ð¦ÄËÒÅÓÌÅÎÎÑ '_' ÔÁ ÒÑÄÏË '%20' ÎÁ ÐÒÏÂ¦Ì ' '"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "ëÏÎ×ÅÒÔÕ×ÁÔÉ ÐÒÏÂ¦Ì ' ' ÎÁ ЦÄËÒÅÓÌÅÎÎÑ '_'"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 #, fuzzy
 msgid "Rename File Scanner - Character Conversion"
 msgstr "ôÁÂÌÉÃÑ ÐÅÒÅËÏÄÕ×ÁÎÎÑ"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 #, fuzzy
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "ôÁÂÌÉÃÑ ÐÅÒÅËÏÄÕ×ÁÎÎÑ"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4283,15 +4335,15 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "÷¦ËÎÏ ÓËÁÎÅÒÁ"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "÷¦ÄËÒÉÔÉ ×¦ËÎÏ ÓËÁÎÅÒÁ ÎÁ ÐÏÞÁÔËÕ ÒÏÂÏÔÉ"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4299,11 +4351,11 @@ msgstr ""
 "áËÔÉ×ÕÊÔÅ, ÝÏ צËÎÏ ÓËÁÎÅÒÁ Á×ÔÏÍÁÔÉÞÎÏ ×¦ÄËÒÉ×ÁÌÏÓÑ ÎÁ ÐÏÞÁÔËÕ ÒÏÂÏÔÉ "
 "EasyTAG."
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "÷¦ËÎÏ ÓËÁÎÅÒÁ ÚÁ×ÖÄÉ Ú×ÅÒÈÕ"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4312,37 +4364,37 @@ msgstr ""
 "צËÎÁ."
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "ðÏÌÑ"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "ðÅÒÅÚÁÐÉÓÕ×ÁÔÉ ÐÏÌÑ × ÐÒÏÃÅÓ¦ ÓËÁÎÕ×ÁÎÎÑ ÔÅǦ×"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "ôÅËÓÔ ÑË ÔÉÐÏ×ÉÊ ËÏÍÅÎÔÁÒ:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4351,45 +4403,45 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "îÁÚ×Á: "
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "ðÏÒÔ: "
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "ûÌÑÈ ÄÏ CGI: "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "îÁÓÔÒÏÊËÁ ÓÅÒ×ÅÒÁ"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "ðÏÛÕË × CDDB"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 #, fuzzy
 msgid "Path :"
 msgstr "ûÌÑÈ ÄÏ CGI: "
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4398,66 +4450,66 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "îÁÓÔÒÏÊËÉ ÐÒÏËÓ¦"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÒÏËÓ¦"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "áËÔÉ×ÕÊÔÅ ÎÁÓÔÒÏÊËÉ ÐÒÏËÓ¦-ÓÅÒ×ÅÒÁ."
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "áÄÒÅÓÁ: "
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "¶Í'Ñ ÐÒÏËÓ¦-ÓÅÒ×ÅÒÁ."
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "ðÏÒÔ ÐÒÏËÓ¦-ÓÅÒ×ÅÒÁ."
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ: "
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ ÄÌÑ ÐÒÏËÓ¦-ÓÅÒ×ÅÒÁ."
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "ðÁÒÏÌØ: "
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "ðÁÒÏÌØ ËÏÒÉÓÔÕ×ÁÞÁ ÄÌÑ ÐÒÏËÓ¦-ÓÅÒ×ÅÒÁ."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 #, fuzzy
 msgid "Track Name List"
 msgstr "îÁÚ×Á ÔÒÅËÁ"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
 msgstr ""
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4466,15 +4518,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ×ÉÈÏÄÕ Ú ÐÒÏÇÒÁÍÉ"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4482,57 +4534,61 @@ msgstr ""
 "ëÏÌÉ ÁËÔÉ×Ï×ÁÎÏ, ×ÉÄÁ¤ ĦÁÌÏÇÏ׊צËÎÏ ¦Ú ÚÁÐÉÔÏÍ Ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÐÅÒÅÄ "
 "×ÉÈÏÄÏÍ Ú ÐÒÏÇÒÁÍÉ."
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÚÁÐÉÓÕ ÔÅÇÕ ÄÏ ÆÁÊÌÁ"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÆÁÊÌÁ"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ×ÉÄÁÌÅÎÎÑ ÆÁÊÌÁ"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÚÁÐÉÓÕ ÓÐÉÓËÕ ×¦ÄÔ×ÏÒÅÎÎÑ"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "úÁÓÔÏÓÕ×ÁÔÉ ÚͦÎÉ (ÁÌÅ ÎÅ ÚÂÅÒ¦ÇÁÔÉ) ÔÁ ÚÁËÒÉÔÉ ×¦ËÎÏ"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "úÁËÒÉÔÉ ×¦ËÎÏ ÂÅÚ ÚÂÅÒÅÖÅÎÎÑ"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ Ê ÚÁËÒÉÔÉ ÃŠצËÎÏ"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "úͦÎÉ ÚÁÓÔÏÓÏ×ÁΦ"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "ëÏÎƦÇÕÒÁæÀ ÚÂÅÒÅÖÅÎÏ"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "ëÏÎƦÇÕÒÁæÀ ÎÅ ÚͦÎÅÎÏ"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, fuzzy, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4543,58 +4599,58 @@ msgstr ""
 "%s\n"
 "(%s)"
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "ãÅ ÎÅ ËÁÔÁÌÏÇ"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "úÁÐÏ×ÎÉÔÉ ÔÅÇ"
 
-#: src/scan.c:180
+#: src/scan.c:181
 #, fuzzy
 msgid "Rename File and Directory"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ËÁÔÁÌÏÇÁ"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "ïÂÒÏÂËÁ ÐÏ̦×"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "ôÅÇ ÐÒÏÓËÁÎÏ×ÁÎÏ..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "ôÅÇ ÐÒÏÓËÁÎÏ×ÁÎÏ... (%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "ðÏÍÉÌËÁ óËÁÎÅÒÁ: ÎÅ ÍÏÖÕ ÚÎÁÊÔÉ ÒÏÚĦÌØÎÉË '%s' × '%s'"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "îÏ×Å ¦Í'Ñ ÆÁÊÌÁ ÐÒÏÓËÁÎÏ×ÁÎÏ..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "îÏ×Å ¦Í'Ñ ÆÁÊÌÁ ÐÒÏÓËÁÎÏ×ÁÎÏ... (%s)"
@@ -4602,57 +4658,57 @@ msgstr "
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "óËÁÎÕ×ÁÎÎÑ ÔÅÇÕ ÔÁ ¦ÍÅΦ ÆÁÊÌÁ"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "óËÁÎÅÒ: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "÷ÉÂÅÒ¦ÔØ, ÑËÉÊ ÔÉÐ ÓËÁÎÅÒÕ ×ÉËÏÒÉÓÔÁÔÉ"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 #, fuzzy
 msgid "Open scanner window / Scan selected files"
 msgstr "óËÁÎÕ×ÁÔÉ ×ÉĦÌÅΦ ÆÁÊÌÉ"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "ðÁÒÁÍÅÔÒÉ óËÁÎÅÒÁ"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "ðÏËÁÚÁÔÉ/ÓÈÏ×ÁÔÉ ÒÅÄÁËÔÏÒ ÍÁÓÏË"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "ðÏËÁÚÁÔÉ/ÓÈÏ×ÁÔÉ ÌÅÇÅÎÄÕ"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "úÁËÒÉÔÉ ×¦ËÎÏ"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "ðÏÐÅÒÅÄÎ¦Ê ÐÅÒÅÇÌÑÄ..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4661,222 +4717,232 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "ðÏÐÅÒÅÄÎ¦Ê ×ÉÇÌÑÄ: ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÆÁÊÌÁ..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "÷ÉÂÅÒ¦ÔØ ÐÏÌÑ:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
 msgstr ""
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "æ"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ¦ÍÅΦ ÆÁÊÌÁ"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "ú"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "÷"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ×ÉËÏÎÁ×ÃÑ"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ×ÉËÏÎÁ×ÃÑ"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "á"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ÁÌØÂÏÍÕ"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "çÂ"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ÖÁÎÒÕ"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 #, fuzzy
 msgid "Cm"
 msgstr "ë"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ËÏÍÅÎÔÁÒÑ"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 #, fuzzy
 msgid "Cp"
 msgstr "ë"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 #, fuzzy
 msgid "Process composer field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ËÏÍÅÎÔÁÒÑ"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr ""
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 #, fuzzy
 msgid "Process original artist field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ×ÉËÏÎÁ×ÃÑ"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 #, fuzzy
 msgid "Cr"
 msgstr "ë"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 #, fuzzy
 msgid "Process copyright field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ËÏÍÅÎÔÁÒÑ"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 #, fuzzy
 msgid "Process URL field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 #, fuzzy
 msgid "Process encoder name field"
 msgstr "ïÂÒÏÂÌÀ×ÁÔÉ ÐÏÌÅ ¦ÍÅΦ ÆÁÊÌÁ"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ɦÒËÕ"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "÷ÉÂÒÁÔÉ/óËÁÓÕ×ÁÔÉ ×ɦÒËÕ."
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "ëÏÎ×ÅÒÔÕ×ÁÔÉ '_'ÔÁ '%20' ÎÁ ' '"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 #, fuzzy
 msgid "Convert:"
 msgstr "ðÏÒÔ: "
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 #, fuzzy
 msgid "to: "
 msgstr "×: "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr ""
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
 msgstr ""
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "÷ÓÔÁ×ÉÔÉ ÐÒÏÐÕÓË ÐÅÒÅÄ ÷ÅÌÉËÏÀ ̦ÔÅÒÏÀ"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "÷ÉÄÁÌÉÔÉ ÄÕÂÌØÏ×ÁΦ ÐÒϦÌÉ ÔÁ ЦÄËÒÅÓÌÅÎÎÑ"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4885,187 +4951,192 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "ìÅÇÅÎÄÁ"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : ×ÉËÏÎÁ×ÅÃØ"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : ×ÉËÏÎÁ×ÅÃØ"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : ÁÌØÂÏÍ"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : ËÏÍÅÎÔÁÒ"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, fuzzy, c-format
 msgid "%p : composer"
 msgstr "%c : ËÏÍÅÎÔÁÒ"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, fuzzy, c-format
 msgid "%e : encoded by"
 msgstr "ëÏÄÕ×ÁÌØÎÉË:"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ÓÔÉÌØ"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ¦ÇÎÏÒÕ¤ÔØÓÑ"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : ˦ÌØ˦ÓÔØ ÔÒÅ˦×"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, fuzzy, c-format
 msgid "%o : orig. artist"
 msgstr "%a : ×ÉËÏÎÁ×ÅÃØ"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : ÔÒÅË"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : ÎÁÚ×Á"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : Ò¦Ë"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "òÅÄÁËÔÏÒ ÍÁÓÏË"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÍÁÓËÕ"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "ð¦ÄÎÑÔÉ ÎÁ ÏÄÎÕ ÐÏÚÉæÀ"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "ïÐÕÓÔÉÔÉ ÎÁ ÏÄÎÕ ÐÏÚÉæÀ"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "äÕÂÌÀ×ÁÔÉ ÍÁÓËÕ"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "äÏÄÁÔÉ ÔÉÐÏ×Õ"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "÷ÉÄÁÌÉÔÉ ÍÁÓËÕ"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "úÂÅÒÅÇÔÉ ÍÁÓËÉ"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "îÏ×Á_íÁÓËÕ"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "ëÏЦÀ×ÁÔÉ: ÎÅ ×ÉÂÒÁÎÏ ÒÑÄÏË!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "÷ÉÄÁÌÉÔÉ: ÎÅ ×ÉÂÒÁÎÏ ÒÑÄÏË!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "úͦÓÔÉÔÉ ×ÇÏÒÕ: ÎÅ ×ÉÂÒÁÎÏ ÒÑÄÏË!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "úͦÓÔÉÔÉ ×ÎÉÚ: ÎÅ ×ÉÂÒÁÎÏ ÒÑÄÏË!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ðïíéìëá: îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÆÁÊÌ ÐÁÒÁÍÅÔÒ¦×: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÐÁÒÁÍÅÔÒ¦× '%s' (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÉÐÏ×ÉÈ ÐÁÒÁÍÅÔÒ¦×..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, fuzzy, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ '%s' (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ðïíéìëá: îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÓÐÉÓÏË Õ ÆÁÊÌ: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÉÐÏ×ϧ ÍÁÓËÉ 'úÁÐÏ×ÎÉÔÉ ôÅÇÉ'..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÉÐÏ×ϧ ÍÁÓËÉ 'ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÆÁÊÌÉ'..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÉÐÏ×ϧ ÍÁÓËÉ 'ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÆÁÊÌÉ'..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "ðïíéìëá: ÚͦÎÎÁ HOME ÎÅ ×ÉÚÎÁÞÅÎÁ!\n"
 "\n"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ðïíéìëá: îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ '%s' (%s)!"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index ca29596..e83af25 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8b8dd0b..652f27c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag-2.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-10-25 18:58+0800\n"
 "Last-Translator: Yang Jinsong <shannleon at gmail.com>\n"
 "Language-Team: Simplified Chinese\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,6 +30,7 @@ msgstr ""
 "音频文 件标签变得简单而高效。"
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(德语翻译)"
 
@@ -108,137 +110,137 @@ msgstr "(Hebrew translation)"
 msgid "(Serbian translation)"
 msgstr "(Serbian translation)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr "后缀名"
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr "状态"
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "备注"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "关于..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "关于"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(编译于: %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(使用: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "作者: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "电子邮件: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "Web 页面:"
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "描述:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr "后缀"
 
-#: src/about.c:435
+#: src/about.c:439
 msgid "MP3 file support"
 msgstr "MP3 文件支持"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr "允许"
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr "不允许"
 
-#: src/about.c:451
+#: src/about.c:455
 msgid "ID3v2.3 tags writting support"
 msgstr "ID3V2.3 标签写入支持"
 
-#: src/about.c:454
+#: src/about.c:458
 msgid "available"
 msgstr "可用"
 
-#: src/about.c:465
+#: src/about.c:469
 msgid "Ogg Vorbis file support"
 msgstr "Ogg Vorbis 文件支持"
 
-#: src/about.c:477
+#: src/about.c:481
 msgid "Speex file support"
 msgstr "Speex 文件支持"
 
-#: src/about.c:493
+#: src/about.c:497
 msgid "FLAC file support"
 msgstr "FLAC 文件支持"
 
-#: src/about.c:506
+#: src/about.c:510
 msgid "MP4/AAC file support"
 msgstr "MP4/AAC 文件支持"
 
-#: src/about.c:518
+#: src/about.c:522
 msgid "WavPack file support"
 msgstr "WavPack 文件支持"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "致谢"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "翻译:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "一般:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "变更"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "无法打开文件 “%s” (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "文件打开时出错: “%s” (%s)。"
@@ -246,484 +248,494 @@ msgstr "文件打开时出错: “%s” (%s)。"
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "按标签排序"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "按属性排序"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "文件名升序"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "文件名降序"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "创建日期升序"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "创建日期降序"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "轨道号码升序"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "轨道号码降序"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "标题升序"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "标题降序"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "艺术家升序"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "艺术家降序"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "艺术家升序"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "艺术家降序"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "专辑升序"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "专辑降序"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "年份升序"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "年份降序"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "流派升序"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "流派降序"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "备注升序"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "备注降序"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "作曲家升序"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "作曲家降序"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "原始艺术家升序"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "原始艺术家降序"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "版权升序"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "版权降序"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "URL 升序"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "URL 降序"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "编码器名升序"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "编码器名降序"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "文件类型升序"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "文件类型降序"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "文件大小升序"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "文件大小降序"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "播放时长升序"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "播放时长降序"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "比特率升序"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "比特率降序"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "采样率升序"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "采样率降序"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "使用其他程序打开..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "选择所有文件"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "取消选择所有文件"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "反向选择文件"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "删除文件"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "第一个文件(_F)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "第一个文件"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "上一个文件(_P)"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "上一个文件"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "下一个文件(_N)"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "下一个文件"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "最后一个文件(_L)"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "最后一个文件"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "扫描文件(_C)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "扫描文件"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "移除标签(_R)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "移除标签"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "撤消最后的文件变更(_U)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "撤消最后的文件变更"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "重做最后的文件变更(_E)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "重做最后的文件变更"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "保存文件(_S)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "保存文件"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "强制保存文件(_F)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "强制保存文件"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "撤消最后的变更"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "重做最后的变更"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "退出"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "浏览器(_B)"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "前往家目录(_H)"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "前往家目录"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "前往默认目录"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "前往家目录"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "前往家目录"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "前往家目录"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "前往默认目录(_D)"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "前往默认目录"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "将当前路径设置为默认(_C)"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "将当前路径设置为默认"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "树视图 | 艺术家-专辑视图"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "重命名目录..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "重新载入目录"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "使用其他程序浏览目录..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "折叠树(_C)"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "刷新树(_R)"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "扫描器(_C)"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "填充标签(_F)..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "填充标签..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "重命名文件和目录(_R)..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "重命名文件和目录..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "处理域(_P)..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "处理域..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "其他(_M)"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "搜索文件(_F)..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "搜索文件..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "CD 数据库搜索(_B)..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB 搜索..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "从文本文件载入文件名..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "保存播放列表..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "运行音频播放器"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "设置(_S)"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "首选项(_P)..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "首选项..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "关于(_A)"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "停止当前动作"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "文件操作(_F)"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "CDDB 搜索文件..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "清除日志"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "浏览子目录(_S)"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "显示隐藏目录"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "显示树浏览器 / 按艺术家和专辑显示"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "无法合并界面,错误: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "准备就绪..."
 
@@ -732,7 +744,7 @@ msgid "New default path for files selected"
 msgstr "所选择文件的新默认目录"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "确认..."
 
@@ -744,87 +756,92 @@ msgstr ""
 "有些文件被更改了但却没有保存...\n"
 "您希望在变更目录前保存它们吗?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<所有专辑>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "错误:搜索 “%s”,无法在树中找到节点 %s。"
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "æ ‘"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "文件名"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "标题"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "艺术家"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "专辑"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "年份"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "音轨"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "流派"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "作曲家"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "原始艺术家"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "版权所有"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "URL"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "使用的编码器"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# 专辑"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# 文件"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "前往上层目录"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "键入目录以浏览。"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "选择一个目录以浏览!"
@@ -832,63 +849,63 @@ msgstr "选择一个目录以浏览!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u 个文件"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "艺术家 & 专辑"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "重命名目录"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "重命名目录 '%s' 为: "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "使用掩码:"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "如果激活则使用掩码重命名目录。"
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
 msgstr "选择或输入一个掩码(参看扫描器窗口图示)用来以标签域重命名目录。"
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "非法的扫描器掩码"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "重命名目录预览..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "错误..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "您必须输入一个目录名!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "无法转换 “%s” 为文件名编码。请选择另一个名字。"
@@ -921,7 +938,7 @@ msgstr "无法转换 “%s” 为文件名编码。请选择另一个名字。"
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -930,7 +947,7 @@ msgstr ""
 "无法重命名因为此目录名已经存在!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -945,99 +962,99 @@ msgstr ""
 "“%s”!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "目录已被重命名"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "要运行的程序:"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "键入要运行的程序名。它将以当前目录为参数。"
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "使用其他程序打开文件..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "键入要运行的程序名。它将以当前文件为参数。"
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "您必须输入一个程序名!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "程序 “%s” 未被找到!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "无法执行 %s (错误 %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "无法创建另一个进程!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "已执行命令: “%s %s”"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "艺术家 / 专辑"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "类别"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "音轨名"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "时间"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "CD 数据库搜索"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "自动搜索"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "请求 CD 数据库:"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
 msgstr "自动使用所选文件(顺序很重要!)请求 CDDB 数据库生成 CddbID。"
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "停止搜索..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "使用本地 CDDB"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1046,137 +1063,137 @@ msgstr "选项被激活时,装入域以后当前选择的扫描器将运行(
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "手动搜索"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "词语:"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "键入需要搜索的词 (使用空格或 “+” 号分隔)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "搜索:"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "所有域"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "其他"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "所有类别"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Classical"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Misc"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "包括: funk, soul, rap, pop, industrial, metal, 其它。"
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "电影,表演"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "其他不符合以上类别的"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " 类别 "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "结果:"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "搜索:"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "输入词语在下面的列表中搜索"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "搜索下一个"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "搜索上一个"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "在 “艺术家/专辑” 列表中只显示红色行(或所有行)"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "撤销选择所有行"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "反向选择行"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "选择所有行"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1188,36 +1205,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "设置到:"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "所有"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "音轨 #"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "# 音轨"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "每一个文件都运行当前的扫描器"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "使用 Levenshtein 算法匹配行"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1229,90 +1246,94 @@ msgstr ""
 "前目 录中每个文件的 CDDB 标题并选择最佳匹配。在选择音频文件或应用 CDDB 结果时"
 "将被使用, 而 不是直接读取位置顺序。"
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "加载所选行或所有行(如果没有行被选中的话)。"
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "搜索准备就绪..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr "专辑:“%s”,艺术家:“%s”,长度:“%s”,年份:“%s”,流派:“%s”,ID:“%s”"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "反向选择"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "按音轨号排序"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "按音轨名排序"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "正在解析主机 “%s”..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "无法解析主机 “%s” (%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "无法创建新的套接字 (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "正在连接主机 “%s”,端口 “%d” ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "无法连接主机 “%s” (%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "已连接到主机 “%s”"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "正在接收数据 (%s) ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "读取 CDDB 响应时发生错误 (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "无法创建文件 “%s” (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "无法打开文件 “%s” (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "正在发送请求 ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "无法发送请求 (%s)!"
@@ -1321,62 +1342,63 @@ msgstr "无法发送请求 (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "正在接收数据 ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "服务器返回一个错误响应!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "服务器返回一个错误响应!(%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "对不起,基于 Web 的搜索当前不可用!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "找到 %d 个匹配的专辑"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "正在接收页 %d 中的数据 (专辑 %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "正在接收页 %d 中的数据..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "载入更多结果..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "没有文件被选择!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "超过 99 个文件被选择!无法发送请求!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d 个文件被选择!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "本地 CD 搜索..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 #, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
@@ -1385,28 +1407,28 @@ msgstr ""
 "“本地 CD 数据库” 路径未设置!\n"
 "请在首选项窗口中设置。"
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "正在发送请求 (CddbId: %s, 音轨数: %d, 时长: %d)..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "发现 %d 个专辑匹配 DiscID “%s”"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "无法加载文件:“%s” (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "正在载入专辑音轨列表 ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1418,7 +1440,7 @@ msgstr ""
 "\n"
 "您是否要继续?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "从 CDDB 写入标签..."
 
@@ -1676,7 +1698,7 @@ msgstr "未知的参数或路径 “%s”\n"
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "文件"
 
@@ -1690,11 +1712,11 @@ msgstr "断裂的文件链接"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?,层 ?"
 
@@ -1702,7 +1724,7 @@ msgstr "?,层 ?"
 msgid "Bitrate:"
 msgstr "比特率:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/s"
 
@@ -1710,17 +1732,17 @@ msgstr "? kb/s"
 msgid "Freq:"
 msgstr "频率:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "模式:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1737,7 +1759,7 @@ msgid "Time:"
 msgstr "时间:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "标签"
 
@@ -1766,331 +1788,351 @@ msgstr "艺术家:"
 msgid "Tag selected files with this artist"
 msgstr "以此艺术家标志所选文件"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "艺术家:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "以此艺术家标志所选文件"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "专辑:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "以此专辑名标志所选文件"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "光盘:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "以此光盘号标志所选文件"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "年份:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "以此年份标志所选文件"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "音轨 #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr "将相同目录中显示的文件数号码作为所选音轨。"
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "以此音轨数标志所选文件"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "流派:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "以此流派标志所选文件"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "备注:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "以此备注标志所选文件"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "作曲家:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "以此作曲家标志所选文件"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "原始艺术家:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "以此原始艺术家标志所选文件"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "版权所有:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "以此版权标志所选文件"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "以此 URL 标志所选文件"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "使用的编码器:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "以此编码器名标志所选文件"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "图片"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "图片:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "您可以使用拖放操作增加图片。"
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "以此图片标志所选文件"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "为标签增加图片 (可使用拖放操作)。"
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "删除所选图片,否则删除全部图片。"
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "保存所选图片至硬盘。"
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "为所选图片设置属性。"
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "选择标题被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "从所选文件中移除标题。"
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "选择艺术家被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "从所选文件中移除艺术家。"
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "选择艺术家被标志为 “%s” 的文件。"
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "从所选文件中移除艺术家。"
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "选择专辑被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "从所选文件中移除专辑名。"
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "碟片号码被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "从所选文件中移除碟片号码。"
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "选择年份被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "从所选文件中移除年份。"
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "选择音轨被标志为像 “xx/%s” 的文件。"
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "选择音轨被标志为像 “xx” 的文件。"
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "从所选文件中移除音轨号。"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "Selected tracks numbered sequentially."
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "选择流派被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "从所选文件中移除流派。"
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "选择备注被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "从所选文件中移除备注。"
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "选择作曲家被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "从所选文件中移除作曲家。"
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "选择原始艺术家被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "从所选文件中移除原始艺术家。"
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "选择版权被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "从所选文件中移除版权。"
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "选择 URL 被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "从所选文件中移除 URL。"
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "选择编码器被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "从所选文件中移除编码器名。"
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "选择被标注为拥有图片的文件。"
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "从所选文件中移除图片。"
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "选择模式与掩码,并重做相同动作。"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "所有标签都已扫描"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "所有标签都已移除"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "搜索文件..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "所有文件都已保存..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "文件部分被删除..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "所有文件都已删除..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2099,16 +2141,16 @@ msgstr ""
 "您是否想写入文件的标签\n"
 "“%s”?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "写入标签..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "重命名文件与目录..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2122,11 +2164,11 @@ msgstr ""
 "“%s”?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "重命名目录..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2140,11 +2182,11 @@ msgstr ""
 "“%s”?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "重命名文件..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2157,17 +2199,17 @@ msgstr ""
 "为 \n"
 "“%s”?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "正在写入 “%s” 的标签"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "标签已写入"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2176,21 +2218,21 @@ msgstr ""
 "无法写入文件 “%s” 的标签!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "无法写入文件 “%s” 的标签!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "正在重命名文件 “%s”"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2203,7 +2245,7 @@ msgstr ""
 "“%s”!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2212,11 +2254,11 @@ msgstr ""
 "“%s”!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "文件未被重命名..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2229,7 +2271,7 @@ msgstr ""
 "因为此文件已存在:\n"
 "“%s”"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2238,7 +2280,7 @@ msgstr ""
 "因为此文件已存在:\n"
 "“%s”"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2249,7 +2291,7 @@ msgstr ""
 "“%s”!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2258,16 +2300,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "已重命名文件 “%s” 为 “%s”"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "文件已被改名..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2278,7 +2320,7 @@ msgstr ""
 "“%s”!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2287,17 +2329,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "已移动文件 “%s” 到 “%s”"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "文件已移动..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2310,7 +2352,7 @@ msgstr ""
 "“%s”!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2319,11 +2361,11 @@ msgstr ""
 "“%s”!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "文件未移动..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2332,16 +2374,16 @@ msgstr ""
 "您是否真的希望删除文件\n"
 "“%s”?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "删除文件..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "文件 “%s” 已删除"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2353,109 +2395,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "搜索进行中..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "文件: “%s”"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "在此目录与其子目录中找到 %d 个文件。"
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "在此目录中找到 %d 个文件。"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u 个文件"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "在此目录与其子目录中未发现文件!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "在此目录中未发现文件!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "正在搜索..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  停止搜索...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "选择一个目录以浏览!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "以此域标志所选文件"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "转换 “_” 和 “%20” 为空格"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "转换 “ ” 为 “_”"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "所有字母大写"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "所有字母小写"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "第一个字母大写"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "每个词第一个字母大写"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "移除空格"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "大写字母前插入空格"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "移除多余的空格或下划线"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: 非正常退出!(PId: %d)。"
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "收到信号 %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2465,11 +2506,11 @@ msgstr ""
 "(方法为 “gdb easytag core” 输入 “bt” 与 “l”) 与使错误重现的方法的错误报告 到 "
 "easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "未知信号"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, c-format
 msgid ""
 "\n"
@@ -2502,11 +2543,11 @@ msgstr ""
 "path_to/files     使用相对路径。\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: 正常退出。"
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2514,82 +2555,82 @@ msgstr ""
 "一些文件已被修改但却还未存储...\n"
 "您是否想在退出程序前保存他们?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr " 您是否真的要退出程序? "
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 标签"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis 标签"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis 标签"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE 标签"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC 标签"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack 标签"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 文件"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 文件"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis 文件"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex 文件"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC 文件"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack 文件"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio 文件"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC 文件"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack 文件"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "图片 (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2597,14 +2638,14 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2615,11 +2656,11 @@ msgstr ""
 "为系统文件名编码\n"
 "(请尝试设置环境变量 G_FILENAME_ENCODING)。"
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "文件名翻译"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "文件名 “%s” 除 %d 个字符外将被截断!\n"
@@ -2643,54 +2684,54 @@ msgstr "编码器:"
 msgid "Channels:"
 msgstr "声道:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "当做 FLAC 打开文件:“%s” 时发生错误 (%s)。"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "错误: 为文件 “%s” 写入备注时操作失败 (%s)。"
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "写入 “%s” 的标签"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "移除 “%s” 的标签"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "移除 “%s” 的 ID3v1 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "移除 “%s” 的 ID3v2 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "更新 “%s” 的 ID3v2 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2713,77 +2754,77 @@ msgstr ""
 "\n"
 "文件: %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "更新 “%s” 的 ID3v1 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "已更新 “%s” 的标签"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "没有报告的错误"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "没有可用内存"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "没有要处理的数据"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "数据格式不正确"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "没有写入的缓冲区"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "缓冲区太小"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "非法的帧 ID"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "请求的域未发现"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "未知的域类型"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "文件已标签"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "非法的标签版本"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "没有要处理的文件"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "正在尝试写入只读文件"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "压缩/解压时发生错误"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "未知的错误消息!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2792,7 +2833,7 @@ msgstr ""
 "因为破损文件 “%s”\n"
 "将导致 id3lib 库错误,它将不被程序处理。"
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "破损的文件..."
 
@@ -2800,125 +2841,125 @@ msgstr "破损的文件..."
 msgid "Log"
 msgstr "日志"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "选择文件..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "选择目录..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "警告..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "没有指定音频播放器!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "不能执行 %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "生成播放列表"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3U 播放列表名"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "使用目录名"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "编辑掩码"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "播放列表选项"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "仅包含已选择的文件"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
 "如果激活,只有所选文件会被写入列表文件。 其他情况则所有文件都将被写入。"
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "在播放列表中使用完整路径"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "在播放列表中使用相对路径"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "在上层目录中创建播放列表"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "如果激活,播放列表将在上层目录中被创建。"
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "使用 DOS 目录分隔符"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "此选项将替换 UNIX 目录分隔符 “/” 为 DOS 分隔符 “\\”。"
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "播放列表内容"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "只写入列表中的文件"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "使用文件名写入信息"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "写入信息时使用:"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2927,12 +2968,12 @@ msgstr ""
 "播放列表文件 “%s” 已经存在!\n"
 "覆盖吗?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "写入播放列表..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2941,109 +2982,109 @@ msgstr ""
 "无法写入播放列表文件 “%s”!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "播放列表文件 “%s” 已写入"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "光盘"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "使用的编码器"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "搜索文件"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "输入词语搜索文件,什么也不输入则显示所有文件。"
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "在:"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "文件名"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "标签"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "区分大小写"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "找到: %d 个文件"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "从文本文件中载入文件名"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "文件:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " 装载 "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 msgid "Content of TXT file"
 msgstr "文本文件内容"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 msgid "Insert a blank line before the selected line"
 msgstr "在所选行之前插入一个空白行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 msgid "Delete the selected line"
 msgstr "移除所选行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "移除所有空白行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 msgid "Move up the selected line"
 msgstr "上移所选行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 msgid "Move down the selected line"
 msgstr "下移所选行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "重新载入"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 msgid "List of files"
 msgstr "文件列表"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 msgid "Selected line:"
 msgstr "所选行:"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3051,19 +3092,19 @@ msgstr ""
 "当此选项被激活时,文件名被装入以后当前选择的扫描器将会工作 (扫描器窗口必须打"
 "开)。"
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "插入空白行"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "移除此行"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 msgid "Move up this line"
 msgstr "上移此行"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 msgid "Move down this line"
 msgstr "下移此行"
 
@@ -3144,12 +3185,12 @@ msgid ""
 "(file: '%s')."
 msgstr "Ogg Vorbis: 内部逻辑错误, 发现臭虫或者堆栈出错 (文件: “%s”)。"
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "错误: 作为 Vorbis 打开文件 “%s” 时失败 (%s)。"
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "警告: Ogg Vorbis 文件 “%s” 包含 ID3v2 标签。"
@@ -3730,7 +3771,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "强制使用系统字符编码"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3745,7 +3786,7 @@ msgid ""
 "characters"
 msgstr "强制使用系统字符编码方式,不能被表示的字符将被丢弃"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3889,33 +3930,44 @@ msgstr "使用压缩"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "设置 ID3v2 标签的压缩方式"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "写入 ID3 标签使用的字符集"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2 标签"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "写入 ID3v2 标签"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr "如果激活,ID3v2.4 标志将在 MP3 文件头部被添加或更新。否则则移除。"
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "版本:"
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3927,34 +3979,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "字符集:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "使用的 Unicode 编码方式"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "写入文件时标签所使用的字符集。"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "iconv() 函数的附加设定:"
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "否"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -3964,52 +4016,52 @@ msgstr ""
 "使用此选项,当一个字符无法被目标字符集表示的时侯,它将以看起来相似的字符表"
 "示。"
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1 标签"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "写入 ID3v1.x 标签"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr "如果激活,ID3v1 标志将在 MP3 文件头部被添加或更新。否则将移除。"
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "写入文件时 ID3v1 标签所使用的字符集。"
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "读取 ID3 标签时使用的字符集"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "Non-standart:"
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4028,60 +4080,60 @@ msgstr ""
 "  - 如果 unicod 未被使用,俄国人无法选择字符集 “Windows-1251” 来载入 Windows "
 "下写 入的标签。也无法在 Unix 系统下以 “KOI8-R” 编码载入标签。"
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "从文件中读取标签时使用的字符集。"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "扫描器"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "填充标签扫描器 - 字符转换"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "转换下划线 “_” 和字符串 “%20” 为空格 “ ”"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "转换空格 “ ” 为下划线 “_”"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr "如果激活,此转换将在标签扫描器应用掩码时使用。"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "重命名文件扫描器 - 字符转换"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr "如果激活,此转换将在文件名扫描器应用掩码时使用。"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "域扫描器 - 字符转换"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Don't uppercase first letter of words for some prepositions and articles."
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4094,41 +4146,41 @@ msgstr ""
 "An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "扫描器窗口"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "启动时打开扫描器窗口"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "激活此选项将使 EasyTAG 启动时自动打开扫描器窗口。"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "扫描器窗口总是置顶"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr "如果激活,掩码窗口将总是置于主窗口之上。"
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "域"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "扫描标签时覆盖域"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4136,11 +4188,11 @@ msgstr ""
 "如果激活,扫描器将会把已存在的域中文字替换为新的。如果不激活,只有空白的域会"
 "被填充。"
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "将此文本作为默认备注:"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4148,11 +4200,11 @@ msgstr ""
 "激活此选项,如果您希望在使用 “填充标签” 扫描器时将以下字符串填充到备注域。"
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "使用 CRC32 作为默认备注 (仅限使用 ID3 标签的文件)。"
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4163,42 +4215,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD 数据库"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "自动搜索的服务器设置"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "名称:"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "端口:"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI 路径:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "手动搜索的服务器设置"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "本地 CD 数据库"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "路径:"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4210,65 +4262,65 @@ msgstr ""
 "'soundtrack' and 'misc'。"
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "代理服务器设置"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "使用代理服务器"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "激活代理服务器设置"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "主机名:"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "代理服务器名称。"
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "代理服务器端口。"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "用户名:"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "代理服务器用户名。"
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "用户密码:"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "代理服务器用户密码。"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "音轨名列表"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "选择音频文件 (根据位置或 DLM,如果已激活)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
 msgstr "如果激活,当在音轨名列表中选中一行时,主要列表中的音频文件也将被选择。"
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4277,71 +4329,75 @@ msgstr "使用 Levenshtein 算法 (DLM) 匹配行 (使用标题) 与音频文件
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "确认"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "退出程序时请求确认"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "如果激活,退出程序前将打开一个对话框窗口请求确认。"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "为文件写入标签时请求确认"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "重命名文件时请求确认"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "删除文件时请求确认"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "写入播放列表时请求确认"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "应用变更(但不保存)并关闭此窗口"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "不保存变更并关闭此窗口"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "保存变更并关闭此窗口"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(示例: %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "变更已应用"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "配置已保存"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "配置未改变"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4352,57 +4408,57 @@ msgstr ""
 "“%s”\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "不是一个目录"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "音频文件播放器 “%s” 无法被找到!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "填充标签"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "重命名文件和目录"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "处理域"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "标签成功被扫描..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "标签成功被扫描...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr "标签扫描器: 后缀 “%s” 在文件名 “%s” 中未被发现!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "扫描错误: 无法找到分隔符 “%s” 位于 “%s” 中"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "无法转换文件名 “%s” 为系统文件名编码。"
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "新文件名成功被扫描..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "新文件名成功被扫描...(%s)"
@@ -4410,56 +4466,56 @@ msgstr "新文件名成功被扫描...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "标签与文件名扫描"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "扫描器:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "选择使用的扫描方式"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "打开扫描器窗口 / 扫描选择的文件"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "扫描器选项"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "显示 / 隐藏掩码编辑器"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "显示 / 隐藏图示"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
 msgstr "选择或输入掩码 (参看图示) 来处理文件名和路径。用来填充标签域。"
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "填充标签预览..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "以当前路径为掩码前缀"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4471,149 +4527,159 @@ msgstr ""
 "径。"
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "重命名文件预览..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "选择域:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
 msgstr "右侧的按钮表示此域可被处理。当您对其感兴趣的时侯请选择它。"
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "处理文件名域"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "处理标题域"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "处理艺术家域"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "处理艺术家域"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "处理专辑域"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "处理流派域"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "处理备注域"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "处理作曲家域"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "处理原始艺术家域"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "处理版权域"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "处理 URL 域"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "处理编码器域"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "反向选择"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "全选 / 全不选。"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "转换 “_” 和 “%20” 为 “ ”"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "转换:"
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "为: "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
-"下划线字符或字符串 “%20” 被一个空格替换。比如,之前为 “Text%20In%"
-"20An_Entry”, 之后则为 “Text In An Entry”。"
+"下划线字符或字符串 “%20” 被一个空格替换。比如,之前为 “Text%20In"
+"%20An_Entry”, 之后则为 “Text In An Entry”。"
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4621,16 +4687,16 @@ msgstr ""
 "空格字符会被一个下划线字符替换。比如,之前 “Text In An Entry”,之后 "
 "“Text_In_An_Entry”。"
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr "将一个字符串替换为另外一个。 请注意搜索是区分大小写的。"
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4638,7 +4704,7 @@ msgstr ""
 "转换所有域中的词语为大写。比如,之前 “Text IN AN entry”,之后则为 “TEXT IN "
 "AN ENTRY”。"
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4646,7 +4712,7 @@ msgstr ""
 "转换所有域中的词语为小写。比如,之前 “TEXT IN an entry”,之后则为 “text in "
 "an entry”。"
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4654,7 +4720,7 @@ msgstr ""
 "转换所有域中的第一个词语首字母为大写。比如,之前 “text IN An ENTRY”,之后则"
 "为 “Text in an entry”。"
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4662,7 +4728,7 @@ msgstr ""
 "转换所有域中每个词的首字母为大写。比如,之前 “Text in an ENTRY”,之后则为 "
 "“Text In An Entry”。"
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4671,15 +4737,15 @@ msgstr ""
 "在每一个大写字母前插入一个空格。比如,之前 “TextInAnEntry”,之后则为 “Text "
 "In An Entry”。"
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "在大写字母之前插入一个空格"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "移除重复的空格与下划线"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4687,7 +4753,7 @@ msgstr ""
 "移除所有词语间的空格。比如,之前 “Text In An Entry”,之后则为 "
 "“TextInAnEntry”。"
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4695,7 +4761,7 @@ msgstr ""
 "在每一个大写字母前插入一个空格。比如,之前 “TextInAnEntry”,之后则为 “Text "
 "In An Entry”。"
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4706,183 +4772,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "图示"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a :艺术家"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a :艺术家"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b :专辑"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c :备注"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p :作曲"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r :版权"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d:光盘号"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e :编码器"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g :流派"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i :忽略"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l :音轨数"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o :原始艺术家"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n :音轨"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t :标题"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u :URL"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y :年份"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "掩码编辑器"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "创建新掩码"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "上移此掩码"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "下移此掩码"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "复制掩码"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "添加默认掩码"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "删除掩码"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "保存掩码"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "新掩码(_M)"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "复制:没有行被选择!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "删除: 没有行被选择!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "上移: 没有行被选择!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "下移: 没有行被选择!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "错误: 无法写入配置文件: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "无法打开配置文件 “%s” (%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "正在加载默认配置..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "无法创建或打开文件 “%s” (%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "错误: 无法写入列表文件: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "正在载入默认的 “填充标签” 掩码..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "正在载入默认的 “重命名文件” 掩码..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "正在载入默认的 “重命名目录” 掩码..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "错误: 环境变量 HOME 未设置!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "错误: 无法创建目录 “%s” (%s)!"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 800249e..2fe39aa 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a808d2c..352e0ab 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-12 17:02+0200\n"
+"POT-Creation-Date: 2012-02-20 16:47-0800\n"
 "PO-Revision-Date: 2007-09-25 20:57+0800\n"
 "Last-Translator: Jose Sun <josesun at gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,6 +29,7 @@ msgstr ""
 "Linux 下編輯音樂標籤變得非常簡單。"
 
 #: src/about.c:149 src/about.c:150 src/about.c:151 src/about.c:152
+#: src/about.c:183
 msgid "(German translation)"
 msgstr "(德文翻譯)"
 
@@ -109,111 +111,111 @@ msgstr "(希伯來文翻譯)"
 msgid "(Serbian translation)"
 msgstr "(德文翻譯)"
 
-#: src/about.c:235
+#: src/about.c:239
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:236
+#: src/about.c:240
 msgid "Status"
 msgstr ""
 
-#: src/about.c:237 src/browser.c:3029 src/misc.c:1917
+#: src/about.c:241 src/browser.c:3039 src/misc.c:1923
 msgid "Comment"
 msgstr "備註"
 
 #. Config
-#: src/about.c:254
+#: src/about.c:258
 msgid "About..."
 msgstr "關於..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:272 src/bar.c:240
+#: src/about.c:276 src/bar.c:244
 msgid "About"
 msgstr "關於"
 
-#: src/about.c:318
+#: src/about.c:322
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(編譯時間:  %s)"
 
-#: src/about.c:322
+#: src/about.c:326
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(使用: GTK+ %d.%d.%d)"
 
-#: src/about.c:330
+#: src/about.c:334
 #, c-format
 msgid "Author: %s"
 msgstr "作者: %s"
 
-#: src/about.c:334 src/easytag.c:233
+#: src/about.c:338 src/easytag.c:233
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:340
+#: src/about.c:344
 msgid "Web Page: "
 msgstr "網頁:"
 
-#: src/about.c:353
+#: src/about.c:357
 msgid "Description:"
 msgstr "描述:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:369
+#: src/about.c:373
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:435
+#: src/about.c:439
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(已停用 MP3 格式支援)"
 
-#: src/about.c:438 src/about.c:468 src/about.c:480 src/about.c:496
-#: src/about.c:509 src/about.c:521
+#: src/about.c:442 src/about.c:472 src/about.c:484 src/about.c:500
+#: src/about.c:513 src/about.c:525
 msgid "enabled"
 msgstr ""
 
-#: src/about.c:442 src/about.c:458 src/about.c:471 src/about.c:483
-#: src/about.c:500 src/about.c:512 src/about.c:524
+#: src/about.c:446 src/about.c:462 src/about.c:475 src/about.c:487
+#: src/about.c:504 src/about.c:516 src/about.c:528
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:451
+#: src/about.c:455
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(已停用 ID3v2.3 格式支援)"
 
-#: src/about.c:454
+#: src/about.c:458
 #, fuzzy
 msgid "available"
 msgstr "記憶體不足"
 
-#: src/about.c:465
+#: src/about.c:469
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(已停用 Ogg Vorbis 格式支援)"
 
-#: src/about.c:477
+#: src/about.c:481
 #, fuzzy
 msgid "Speex file support"
 msgstr "(已停用 Speex 格式支援)"
 
-#: src/about.c:493
+#: src/about.c:497
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(已停用 FLAC 格式支援)"
 
-#: src/about.c:506
+#: src/about.c:510
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(已停用 MP4/AAC 格式支援)"
 
-#: src/about.c:518
+#: src/about.c:522
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(已停用 WavPack 格式支援)"
@@ -221,33 +223,33 @@ msgstr "(已停用 WavPack 格式支援)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:533
+#: src/about.c:537
 msgid "Thanks"
 msgstr "感謝"
 
-#: src/about.c:553
+#: src/about.c:557
 msgid "Translations:\n"
 msgstr "介面翻譯:\n"
 
-#: src/about.c:583
+#: src/about.c:587
 msgid "General:\n"
 msgstr "一般貢獻:\n"
 
-#: src/about.c:600
+#: src/about.c:604
 msgid "Changes"
 msgstr "變更記錄"
 
-#: src/about.c:622
+#: src/about.c:626
 #, c-format
 msgid "Can't open file '%s' (%s)\n"
 msgstr "無法開啟檔案「%s」 (%s)\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c:4421 src/flac_header.c:126 src/id3_tag.c:145
-#: src/id3_tag.c:1195 src/id3_tag.c:1278 src/misc.c:1760 src/mp4_header.c:211
+#: src/ape_tag.c:74 src/et_core.c:4520 src/flac_header.c:126 src/id3_tag.c:146
+#: src/id3_tag.c:1209 src/id3_tag.c:1292 src/misc.c:1765 src/mp4_header.c:211
 #: src/mp4_header.c:220 src/mp4_tag.c:98 src/mp4_tag.c:109 src/mp4_tag.c:249
 #: src/mp4_tag.c:258 src/mpeg_header.c:209 src/ogg_header.c:82
-#: src/ogg_header.c:186 src/ogg_tag.c:144 src/ogg_tag.c:618
+#: src/ogg_header.c:186 src/ogg_tag.c:145 src/ogg_tag.c:639
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "開啟檔案時發生錯誤: 「%s」 (%s)"
@@ -255,484 +257,494 @@ msgstr "開啟檔案時發生錯誤: 「%s」 (%s)"
 #.
 #. * Main Menu Actions
 #.
-#: src/bar.c:146
+#: src/bar.c:148
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/bar.c:147
+#: src/bar.c:149
 msgid "Sort list by tag"
 msgstr "依標籤排序"
 
-#: src/bar.c:148
+#: src/bar.c:150
 msgid "Sort list by property"
 msgstr "依屬性排序"
 
-#: src/bar.c:149
+#: src/bar.c:151
 msgid "Ascending by filename"
 msgstr "依檔名遞增排序"
 
-#: src/bar.c:150
+#: src/bar.c:152
 msgid "Descending by filename"
 msgstr "依檔名遞減排序"
 
-#: src/bar.c:151
+#: src/bar.c:153
 msgid "Ascending by creation date"
 msgstr "依建立日期遞增排序"
 
-#: src/bar.c:152
+#: src/bar.c:154
 msgid "Descending by creation date"
 msgstr "依建立日期遞減排序"
 
-#: src/bar.c:153
+#: src/bar.c:155
 msgid "Ascending by track number"
 msgstr "依曲目編號遞增排序"
 
-#: src/bar.c:154
+#: src/bar.c:156
 msgid "Descending by track number"
 msgstr "依曲目編號遞減排序"
 
-#: src/bar.c:155
+#: src/bar.c:157
 msgid "Ascending by title"
 msgstr "依曲名遞增排序"
 
-#: src/bar.c:156
+#: src/bar.c:158
 msgid "Descending by title"
 msgstr "依曲名遞減排序"
 
-#: src/bar.c:157
+#: src/bar.c:159
 msgid "Ascending by artist"
 msgstr "依演唱者遞增排序"
 
-#: src/bar.c:158
+#: src/bar.c:160
 msgid "Descending by artist"
 msgstr "依演唱者遞減排序"
 
-#: src/bar.c:159
+#: src/bar.c:161
+#, fuzzy
+msgid "Ascending by album artist"
+msgstr "依演唱者遞增排序"
+
+#: src/bar.c:162
+#, fuzzy
+msgid "Descending by album artist"
+msgstr "依演唱者遞減排序"
+
+#: src/bar.c:163
 msgid "Ascending by album"
 msgstr "依專輯遞增排序"
 
-#: src/bar.c:160
+#: src/bar.c:164
 msgid "Descending by album"
 msgstr "依專輯遞減排序"
 
-#: src/bar.c:161
+#: src/bar.c:165
 msgid "Ascending by year"
 msgstr "依年份遞增排序"
 
-#: src/bar.c:162
+#: src/bar.c:166
 msgid "Descending by year"
 msgstr "依年份遞減排序"
 
-#: src/bar.c:163
+#: src/bar.c:167
 msgid "Ascending by genre"
 msgstr "依曲風遞增排序"
 
-#: src/bar.c:164
+#: src/bar.c:168
 msgid "Descending by genre"
 msgstr "依曲風遞減排序"
 
-#: src/bar.c:165
+#: src/bar.c:169
 msgid "Ascending by comment"
 msgstr "依備註遞增排序"
 
-#: src/bar.c:166
+#: src/bar.c:170
 msgid "Descending by comment"
 msgstr "依備註遞減排序"
 
-#: src/bar.c:167
+#: src/bar.c:171
 msgid "Ascending by composer"
 msgstr "依作曲者遞增排序"
 
-#: src/bar.c:168
+#: src/bar.c:172
 msgid "Descending by composer"
 msgstr "依作曲者遞減排序"
 
-#: src/bar.c:169
+#: src/bar.c:173
 msgid "Ascending by original artist"
 msgstr "依原唱者遞增排序"
 
-#: src/bar.c:170
+#: src/bar.c:174
 msgid "Descending by original artist"
 msgstr "依原唱者遞減排序"
 
-#: src/bar.c:171
+#: src/bar.c:175
 msgid "Ascending by copyright"
 msgstr "依版權所有者遞增排序"
 
-#: src/bar.c:172
+#: src/bar.c:176
 msgid "Descending by copyright"
 msgstr "依版權所有者遞減排序"
 
-#: src/bar.c:173
+#: src/bar.c:177
 msgid "Ascending by URL"
 msgstr "依網址遞增排序"
 
-#: src/bar.c:174
+#: src/bar.c:178
 msgid "Descending by URL"
 msgstr "依網址遞減排序"
 
-#: src/bar.c:175
+#: src/bar.c:179
 msgid "Ascending by encoder name"
 msgstr "依編碼程式遞增排序"
 
-#: src/bar.c:176
+#: src/bar.c:180
 msgid "Descending by encoder name"
 msgstr "依編碼程式遞增排序"
 
-#: src/bar.c:177
+#: src/bar.c:181
 msgid "Ascending by file type"
 msgstr "依檔名遞增排序"
 
-#: src/bar.c:178
+#: src/bar.c:182
 msgid "Descending by file type"
 msgstr "依檔名遞減排序"
 
-#: src/bar.c:179
+#: src/bar.c:183
 msgid "Ascending by file size"
 msgstr "依檔案大小遞增排序"
 
-#: src/bar.c:180
+#: src/bar.c:184
 msgid "Descending by file size"
 msgstr "依檔案大小遞減排序"
 
-#: src/bar.c:181
+#: src/bar.c:185
 msgid "Ascending by duration"
 msgstr "依曲目長度遞增排序"
 
-#: src/bar.c:182
+#: src/bar.c:186
 msgid "Descending by duration"
 msgstr "依曲目長度遞減排序"
 
-#: src/bar.c:183
+#: src/bar.c:187
 msgid "Ascending by bitrate"
 msgstr "依位元率遞增排序"
 
-#: src/bar.c:184
+#: src/bar.c:188
 msgid "Descending by bitrate"
 msgstr "依位元率遞減排序"
 
-#: src/bar.c:185
+#: src/bar.c:189
 msgid "Ascending by samplerate"
 msgstr "依取樣率遞增排序"
 
-#: src/bar.c:186
+#: src/bar.c:190
 msgid "Descending by samplerate"
 msgstr "依取樣率遞減排序"
 
-#: src/bar.c:188
+#: src/bar.c:192
 msgid "Open File(s) with ..."
 msgstr "開啟檔案以..."
 
-#: src/bar.c:189 src/cddb.c:326
+#: src/bar.c:193 src/cddb.c:325
 msgid "Select All Files"
 msgstr "選取所有檔案"
 
-#: src/bar.c:190
+#: src/bar.c:194
 msgid "Unselect All Files"
 msgstr "取消選取所有檔案"
 
-#: src/bar.c:191 src/cddb.c:333
+#: src/bar.c:195 src/cddb.c:332
 msgid "Invert Files Selection"
 msgstr "反向選取檔案"
 
-#: src/bar.c:192
+#: src/bar.c:196
 msgid "Delete File(s)"
 msgstr "刪除檔案"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "_First File"
 msgstr "第一個檔案(_F)"
 
-#: src/bar.c:193
+#: src/bar.c:197
 msgid "First File"
 msgstr "第一個檔案"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "_Previous File"
 msgstr "上一個檔案(_P)"
 
-#: src/bar.c:194
+#: src/bar.c:198
 msgid "Previous File"
 msgstr "上一個檔案"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "_Next File"
 msgstr "下一個檔案(_N)"
 
-#: src/bar.c:195
+#: src/bar.c:199
 msgid "Next File"
 msgstr "下一個檔案"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "_Last File"
 msgstr "最後一個檔案(_L)"
 
-#: src/bar.c:196
+#: src/bar.c:200
 msgid "Last File"
 msgstr "最後一個檔案"
 
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "S_can File(s)"
 msgstr "掃瞄檔案(_C)"
 
-#: src/bar.c:199
+#: src/bar.c:203
 msgid "Scan File(s)"
 msgstr "掃瞄檔案"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "_Remove Tag(s)"
 msgstr "移除標籤(_R)"
 
-#: src/bar.c:200
+#: src/bar.c:204
 msgid "Remove Tag(s)"
 msgstr "移除標籤"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "_Undo Last File(s) Changes"
 msgstr "復原最後檔案變更(_U)"
 
-#: src/bar.c:201
+#: src/bar.c:205
 msgid "Undo Last File(s) Changes"
 msgstr "復原最後檔案變更"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "R_edo Last File(s) Changes"
 msgstr "取消復原最後檔案變更(_E)"
 
-#: src/bar.c:202
+#: src/bar.c:206
 msgid "Redo Last File(s) Changes"
 msgstr "取消復原最後檔案變更"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "_Save File(s)"
 msgstr "儲存檔案(_S)"
 
-#: src/bar.c:203
+#: src/bar.c:207
 msgid "Save File(s)"
 msgstr "儲存檔案"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "_Force Saving File(s)"
 msgstr "強制儲存檔案(_F)"
 
-#: src/bar.c:204
+#: src/bar.c:208
 msgid "Force Saving File(s)"
 msgstr "強制儲存檔案"
 
-#: src/bar.c:205
+#: src/bar.c:209
 msgid "Undo Last Changes"
 msgstr "復原最後變更"
 
-#: src/bar.c:206
+#: src/bar.c:210
 msgid "Redo Last Changes"
 msgstr "取消復原最後變更"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: src/bar.c:207
+#: src/bar.c:211
 msgid "Quit"
 msgstr "離開"
 
-#: src/bar.c:209
+#: src/bar.c:213
 msgid "_Browser"
 msgstr "瀏覽(_B)"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to _Home Directory"
 msgstr "前往家目錄(_H)"
 
-#: src/bar.c:210
+#: src/bar.c:214
 msgid "Go to Home Directory"
 msgstr "前往家目錄"
 
-#: src/bar.c:211
+#: src/bar.c:215
 #, fuzzy
 msgid "Go to Desktop Directory"
 msgstr "前往預設目錄"
 
-#: src/bar.c:212
+#: src/bar.c:216
 #, fuzzy
 msgid "Go to Documents Directory"
 msgstr "前往家目錄"
 
-#: src/bar.c:213
+#: src/bar.c:217
 #, fuzzy
 msgid "Go to Downloads Directory"
 msgstr "前往家目錄"
 
-#: src/bar.c:214
+#: src/bar.c:218
 #, fuzzy
 msgid "Go to Music Directory"
 msgstr "前往家目錄"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to _Default Directory"
 msgstr "前往預設目錄(_D)"
 
-#: src/bar.c:215
+#: src/bar.c:219
 msgid "Go to Default Directory"
 msgstr "前往預設目錄"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set _Current Path as Default"
 msgstr "設定目前路徑為預設(_C)"
 
-#: src/bar.c:216
+#: src/bar.c:220
 msgid "Set Current Path as Default"
 msgstr "設定目前路徑為預設"
 
-#: src/bar.c:217
+#: src/bar.c:221
 msgid "Tree View | Artist-Album View"
 msgstr "樹狀檢視 | 演唱者-專輯檢視"
 
-#: src/bar.c:218
+#: src/bar.c:222
 msgid "Rename Directory ..."
 msgstr "重新命名目錄 ..."
 
-#: src/bar.c:219
+#: src/bar.c:223
 msgid "Reload Directory"
 msgstr "重新載入目錄"
 
-#: src/bar.c:220 src/browser.c:4148
+#: src/bar.c:224 src/browser.c:4173
 msgid "Browse Directory with ..."
 msgstr "瀏覽目錄以 ..."
 
-#: src/bar.c:221
+#: src/bar.c:225
 msgid "_Collapse Tree"
 msgstr "摺疊目錄(_C)"
 
-#: src/bar.c:222
+#: src/bar.c:226
 msgid "_Refresh Tree"
 msgstr "重新整理目錄(_R)"
 
-#: src/bar.c:224 src/bar.c:253
+#: src/bar.c:228 src/bar.c:257
 msgid "S_canner"
 msgstr "掃瞄(_C)"
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "_Fill Tag(s) ..."
 msgstr "標籤填入(_F) ..."
 
-#: src/bar.c:225
+#: src/bar.c:229
 msgid "Fill Tag(s) ..."
 msgstr "標籤填入 ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "_Rename File(s) and Directory ..."
 msgstr "檔案及目錄更名(_R) ..."
 
-#: src/bar.c:226
+#: src/bar.c:230
 msgid "Rename File(s) and Directory ..."
 msgstr "檔案及目錄更名 ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "_Process Field(s) ..."
 msgstr "標籤欄位處理(_P) ..."
 
-#: src/bar.c:227
+#: src/bar.c:231
 msgid "Process Fields(s) ..."
 msgstr "標籤欄位處理 ..."
 
-#: src/bar.c:229
+#: src/bar.c:233
 msgid "_Misc"
 msgstr "其他(_M)"
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search _File(s) ..."
 msgstr "搜尋檔案(_F) ..."
 
-#: src/bar.c:230
+#: src/bar.c:234
 msgid "Search File(s)..."
 msgstr "搜尋檔案 ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CD Data _Base Search ..."
 msgstr "CD 資料庫搜尋(_B) ..."
 
-#: src/bar.c:231
+#: src/bar.c:235
 msgid "CDDB Search ..."
 msgstr "CDDB 搜尋 ..."
 
-#: src/bar.c:232
+#: src/bar.c:236
 msgid "Load Filenames from TXT ..."
 msgstr "從 TXT 檔載入檔名 ..."
 
-#: src/bar.c:233
+#: src/bar.c:237
 msgid "Write Playlist ..."
 msgstr "寫入播放清單 ..."
 
-#: src/bar.c:234 src/bar.c:254 src/bar.c:255 src/bar.c:256
+#: src/bar.c:238 src/bar.c:258 src/bar.c:259 src/bar.c:260
 msgid "Run Audio Player"
 msgstr "執行播放程式"
 
-#: src/bar.c:236
+#: src/bar.c:240
 msgid "_Settings"
 msgstr "設定(_S)"
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "_Preferences ..."
 msgstr "偏好設定(_P) ..."
 
-#: src/bar.c:237
+#: src/bar.c:241
 msgid "Preferences ..."
 msgstr "偏好設定 ..."
 
-#: src/bar.c:239
+#: src/bar.c:243
 msgid "_Help"
 msgstr "說明(_H)"
 
-#: src/bar.c:240
+#: src/bar.c:244
 msgid "_About"
 msgstr "關於(_A)"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: src/bar.c:246
+#: src/bar.c:250
 msgid "Stop the current action"
 msgstr "停止目前動作"
 
 #.
 #. * Popup menu's Actions
 #.
-#: src/bar.c:252
+#: src/bar.c:256
 msgid "_File Operations"
 msgstr "檔案處理(_F)"
 
-#: src/bar.c:257
+#: src/bar.c:261
 msgid "CDDB Search File(s)..."
 msgstr "CDDB 搜尋檔案..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: src/bar.c:261
+#: src/bar.c:265
 msgid "Clean Log"
 msgstr "清除記錄檔"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: src/bar.c:268
+#: src/bar.c:272
 msgid "Browse _Sub-directories"
 msgstr "瀏覽子目錄"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: src/bar.c:271
+#: src/bar.c:275
 msgid "Show Hidden Directories"
 msgstr "顯示隱藏目錄"
 
-#: src/bar.c:273
+#: src/bar.c:277
 msgid "Show tree browser / Display by Artist and Album"
 msgstr "顯示樹狀瀏覽/依演唱者及專輯顯示"
 
-#: src/bar.c:310
+#: src/bar.c:314
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "無法合併 UI,錯誤為: %s\n"
 
-#: src/bar.c:410
+#: src/bar.c:414
 msgid "Ready to start..."
 msgstr "已準備開始..."
 
@@ -741,7 +753,7 @@ msgid "New default path for files selected"
 msgstr "已選擇新的預設檔案路徑"
 
 #. Some files haven't been saved
-#: src/browser.c:752 src/easytag.c:4899 src/easytag.c:4926
+#: src/browser.c:752 src/easytag.c:4943 src/easytag.c:4970
 msgid "Confirm..."
 msgstr "確認..."
 
@@ -753,87 +765,92 @@ msgstr ""
 "某些檔案已修改但尚未儲存...\n"
 "你要在變更目錄前儲存檔案嗎?"
 
-#: src/browser.c:2205
+#: src/browser.c:2215
 msgid "<All albums>"
 msgstr "<所有專輯>"
 
-#: src/browser.c:2616
+#: src/browser.c:2626
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "錯誤: 搜尋檔案 %s 時發生錯誤,於樹狀檢視中找不到節點 %s。"
 
-#: src/browser.c:3027 src/browser.c:3155
+#: src/browser.c:3037 src/browser.c:3165
 msgid "Tree"
 msgstr "樹狀檢視"
 
-#: src/browser.c:3028 src/cddb.c:722 src/misc.c:1909
+#: src/browser.c:3038 src/cddb.c:718 src/misc.c:1914
 msgid "File Name"
 msgstr "檔名"
 
-#: src/browser.c:3028 src/cddb.c:723 src/misc.c:1910
+#: src/browser.c:3038 src/cddb.c:719 src/misc.c:1915
 msgid "Title"
 msgstr "曲名"
 
-#: src/browser.c:3028 src/browser.c:3032 src/cddb.c:437 src/cddb.c:724
-#: src/misc.c:1911
+#: src/browser.c:3038 src/browser.c:3042 src/cddb.c:436 src/cddb.c:720
+#: src/misc.c:1916
 msgid "Artist"
 msgstr "演唱者"
 
-#: src/browser.c:3028 src/browser.c:3033 src/cddb.c:438 src/cddb.c:725
-#: src/misc.c:1912
+#: src/browser.c:3038 src/misc.c:1917
+#, fuzzy
+msgid "Album Artist"
+msgstr "演唱者"
+
+#: src/browser.c:3038 src/browser.c:3043 src/cddb.c:437 src/cddb.c:721
+#: src/misc.c:1918
 msgid "Album"
 msgstr "專輯"
 
-#: src/browser.c:3029 src/cddb.c:726 src/misc.c:1914
+#: src/browser.c:3039 src/cddb.c:722 src/misc.c:1920
 msgid "Year"
 msgstr "年份"
 
-#: src/browser.c:3029 src/misc.c:1915
+#: src/browser.c:3039 src/misc.c:1921
 msgid "Track"
 msgstr "曲目"
 
-#: src/browser.c:3029 src/cddb.c:729 src/misc.c:1916
+#: src/browser.c:3039 src/cddb.c:725 src/misc.c:1922
 msgid "Genre"
 msgstr "曲風"
 
-#: src/browser.c:3030 src/misc.c:1918 src/picture.c:838
+#: src/browser.c:3040 src/misc.c:1924 src/picture.c:838
 msgid "Composer"
 msgstr "作曲者"
 
-#: src/browser.c:3030 src/misc.c:1919
+#: src/browser.c:3040 src/misc.c:1925
 msgid "Orig. Artist"
 msgstr "原唱者"
 
-#: src/browser.c:3030 src/misc.c:1920
+#: src/browser.c:3040 src/misc.c:1926
 msgid "Copyright"
 msgstr "版權所有"
 
-#: src/browser.c:3031 src/misc.c:1921
+#: src/browser.c:3041 src/misc.c:1927
 msgid "URL"
 msgstr "網址"
 
-#: src/browser.c:3031
+#: src/browser.c:3041
 #, fuzzy
 msgid "Encoded By"
 msgstr "編碼程式"
 
-#: src/browser.c:3032
+#: src/browser.c:3042
 msgid "# Albums"
 msgstr "# 專輯"
 
-#: src/browser.c:3032 src/browser.c:3033
+#: src/browser.c:3042 src/browser.c:3043
 msgid "# Files"
 msgstr "# 檔案"
 
-#: src/browser.c:3053
+#: src/browser.c:3063
 msgid "Go to parent directory"
 msgstr "前往上層目錄"
 
-#: src/browser.c:3070
+#: src/browser.c:3080
 msgid "Enter a directory to browse."
 msgstr "請輸入要瀏覽的目錄。"
 
-#: src/browser.c:3079
+#: src/browser.c:3089
 #, fuzzy
 msgid "Select a directory to browse."
 msgstr "請選擇要瀏覽的目錄!"
@@ -841,33 +858,33 @@ msgstr "請選擇要瀏覽的目錄!"
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: src/browser.c:3085
+#: src/browser.c:3095
 #, fuzzy
 msgid "... file(s)"
 msgstr "%u 個檔案"
 
-#: src/browser.c:3206
+#: src/browser.c:3216
 msgid "Artist & Album"
 msgstr "演唱者及專輯"
 
-#: src/browser.c:3678
+#: src/browser.c:3703
 msgid "Rename the directory"
 msgstr "重新命名目錄"
 
-#: src/browser.c:3694
+#: src/browser.c:3719
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "重新命名目錄「%s」為: "
 
-#: src/browser.c:3713 src/misc.c:1268
+#: src/browser.c:3738 src/misc.c:1273
 msgid "Use mask :"
 msgstr "使用遮罩 :"
 
-#: src/browser.c:3716
+#: src/browser.c:3741
 msgid "If activated, it will use masks to rename directory."
 msgstr "啟用此選項會用遮罩條件來重新命名目錄。"
 
-#: src/browser.c:3735
+#: src/browser.c:3760
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -875,31 +892,31 @@ msgstr ""
 "請選擇或利用代碼 (參見掃瞄視窗中的參數說明) 輸入遮罩條件,以利用標籤重新命名"
 "目錄。"
 
-#: src/browser.c:3755 src/misc.c:1288 src/misc.c:1385 src/scan.c:2446
-#: src/scan.c:2513 src/scan.c:2871
+#: src/browser.c:3780 src/misc.c:1293 src/misc.c:1390 src/scan.c:2466
+#: src/scan.c:2533 src/scan.c:2900
 msgid "Invalid Scanner Mask"
 msgstr "掃瞄遮罩條件無效"
 
 #. Preview label
-#: src/browser.c:3761
+#: src/browser.c:3786
 msgid "Rename directory preview..."
 msgstr "重新命名目錄預覽..."
 
 #. Log_Print(LOG_ERROR,msg);
-#: src/browser.c:3877 src/browser.c:3897 src/browser.c:3969 src/browser.c:4010
-#: src/browser.c:4042 src/browser.c:4492 src/browser.c:4511 src/easytag.c:2782
-#: src/easytag.c:2943 src/easytag.c:2989 src/easytag.c:3018 src/easytag.c:3063
-#: src/easytag.c:3115 src/easytag.c:3176 src/easytag.c:3212 src/easytag.c:3251
-#: src/easytag.c:3486 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1138
-#: src/prefs.c:1753 src/prefs.c:1870
+#: src/browser.c:3902 src/browser.c:3922 src/browser.c:3994 src/browser.c:4035
+#: src/browser.c:4067 src/browser.c:4517 src/browser.c:4536 src/easytag.c:2822
+#: src/easytag.c:2983 src/easytag.c:3029 src/easytag.c:3058 src/easytag.c:3103
+#: src/easytag.c:3155 src/easytag.c:3216 src/easytag.c:3252 src/easytag.c:3291
+#: src/easytag.c:3526 src/id3_tag.c:558 src/misc.c:1660 src/picture.c:1138
+#: src/prefs.c:1765 src/prefs.c:1882
 msgid "Error..."
 msgstr "錯誤..."
 
-#: src/browser.c:3881
+#: src/browser.c:3906
 msgid "You must type a directory name!"
 msgstr "你必須輸入目錄名稱!"
 
-#: src/browser.c:3901
+#: src/browser.c:3926
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "無法轉換「%s」為檔名編碼,請輸入其他名稱。"
@@ -932,7 +949,7 @@ msgstr "無法轉換「%s」為檔名編碼,請輸入其他名稱。"
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3967
+#: src/browser.c:3992
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -941,7 +958,7 @@ msgstr ""
 "無法重新命名,該目錄已存在!\n"
 "(%s)"
 
-#: src/browser.c:4008 src/browser.c:4040
+#: src/browser.c:4033 src/browser.c:4065
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -956,99 +973,99 @@ msgstr ""
 "「%s」!\n"
 "(%s)"
 
-#: src/browser.c:4089
+#: src/browser.c:4114
 msgid "Directory renamed"
 msgstr "目錄已重新命名"
 
-#: src/browser.c:4167 src/browser.c:4327
+#: src/browser.c:4192 src/browser.c:4352
 msgid "Program to run :"
 msgstr "要執行的程式 :"
 
-#: src/browser.c:4179
+#: src/browser.c:4204
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "請輸入要執行的程式,目前目錄會自動引入為參數。"
 
-#: src/browser.c:4308
+#: src/browser.c:4333
 msgid "Open File with ..."
 msgstr "開啟檔案以 ..."
 
-#: src/browser.c:4339
+#: src/browser.c:4364
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "請輸入要執行的程式,目前檔案會自動引入為參數。"
 
-#: src/browser.c:4496
+#: src/browser.c:4521
 msgid "You must type a program name!"
 msgstr "你必須輸入程式名稱!"
 
-#: src/browser.c:4510 src/misc.c:868
+#: src/browser.c:4535 src/misc.c:873
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "找不到程式「%s」!"
 
-#: src/browser.c:4565 src/misc.c:914
+#: src/browser.c:4590 src/misc.c:919
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "無法執行 %s (錯誤 %d)!\n"
 
-#: src/browser.c:4584 src/misc.c:953
+#: src/browser.c:4609 src/misc.c:958
 msgid "Can't fork another process!\n"
 msgstr "無法產生其他程序!\n"
 
-#: src/browser.c:4618
+#: src/browser.c:4643
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "執行命令:「%s %s」"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Artist / Album"
 msgstr "演唱者/專輯"
 
-#: src/cddb.c:229
+#: src/cddb.c:228
 msgid "Category"
 msgstr "分類"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:230 src/cddb.c:439
+#: src/cddb.c:229 src/cddb.c:438
 msgid "Track Name"
 msgstr "曲目編號"
 
-#: src/cddb.c:230
+#: src/cddb.c:229
 msgid "Time"
 msgstr "時間"
 
-#: src/cddb.c:241
+#: src/cddb.c:240
 msgid "CD Data Base Search"
 msgstr "CD 資料庫搜尋"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:273
+#: src/cddb.c:272
 msgid "Automatic Search"
 msgstr "自動搜尋"
 
-#: src/cddb.c:285
+#: src/cddb.c:284
 msgid "Request CD database :"
 msgstr "要求 CD 資料庫 :"
 
-#: src/cddb.c:295
+#: src/cddb.c:294
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
 msgstr "自動從 CDDB 資料庫要求所選取檔案 (選取次序很重要!)  的 CCDB ID。"
 
-#: src/cddb.c:305 src/cddb.c:415
+#: src/cddb.c:304 src/cddb.c:414
 msgid "Stop the search ..."
 msgstr "停止搜尋 ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:312
+#: src/cddb.c:311
 msgid "Use local Cddb"
 msgstr "使用本機 CDDB"
 
-#: src/cddb.c:315 src/cddb.c:769
+#: src/cddb.c:314 src/cddb.c:765
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1058,137 +1075,137 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:360
+#: src/cddb.c:359
 msgid "Manual Search"
 msgstr "手動搜尋"
 
-#: src/cddb.c:375
+#: src/cddb.c:374
 msgid "Words :"
 msgstr "文字 :"
 
-#: src/cddb.c:387
+#: src/cddb.c:386
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "請輸入要搜尋的文字 (以空格或「+」分開)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:427
+#: src/cddb.c:426
 msgid "Search In :"
 msgstr "搜尋於 :"
 
-#: src/cddb.c:435
+#: src/cddb.c:434
 msgid "All Fields"
 msgstr "所有欄位"
 
-#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+#: src/cddb.c:439 src/picture.c:816 src/prefs.c:806
 msgid "Other"
 msgstr "其他"
 
-#: src/cddb.c:462
+#: src/cddb.c:461
 msgid "All Categories"
 msgstr "所有分類"
 
-#: src/cddb.c:464
+#: src/cddb.c:463
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:465
+#: src/cddb.c:464
 msgid "Classical"
 msgstr "Classical"
 
-#: src/cddb.c:466
+#: src/cddb.c:465
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:467
+#: src/cddb.c:466
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:468
+#: src/cddb.c:467
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Misc"
 
-#: src/cddb.c:470
+#: src/cddb.c:469
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:471
+#: src/cddb.c:470
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:472
+#: src/cddb.c:471
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:473
+#: src/cddb.c:472
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:510
+#: src/cddb.c:509
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "包含: funk, soul, rap, pop, industrial, metal 等..."
 
-#: src/cddb.c:511
+#: src/cddb.c:510
 msgid "movies, shows"
 msgstr "影片,顯示"
 
-#: src/cddb.c:512
+#: src/cddb.c:511
 msgid "others that do not fit in the above categories"
 msgstr "其他不符合上列分類的檔案"
 
 #. Button to display/hide the categories
-#: src/cddb.c:515
+#: src/cddb.c:514
 msgid " Categories "
 msgstr " 分類"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:523
+#: src/cddb.c:522
 msgid "Results :"
 msgstr "結果 :"
 
-#: src/cddb.c:530 src/misc.c:1963
+#: src/cddb.c:529 src/misc.c:1969
 msgid "Search :"
 msgstr "搜尋 :"
 
-#: src/cddb.c:543
+#: src/cddb.c:542
 msgid "Enter the words to search in the list below"
 msgstr "請輸入下列的文字搜尋"
 
-#: src/cddb.c:555
+#: src/cddb.c:554
 msgid "Search Next"
 msgstr "找下一個"
 
-#: src/cddb.c:561
+#: src/cddb.c:560
 msgid "Search Previous"
 msgstr "找上一個"
 
-#: src/cddb.c:572
+#: src/cddb.c:571
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "只顯示「演唱者/專輯」清單中的紅色項目 (或顯示所有項目)"
 
-#: src/cddb.c:578 src/cddb.c:1504
+#: src/cddb.c:577 src/cddb.c:1500
 msgid "Unselect all lines"
 msgstr "取消選取所有項目"
 
-#: src/cddb.c:584
+#: src/cddb.c:583
 msgid "Invert lines selection"
 msgstr "反向選擇項目"
 
-#: src/cddb.c:590 src/cddb.c:1499
+#: src/cddb.c:589 src/cddb.c:1495
 msgid "Select all lines"
 msgstr "選擇所有項目"
 
-#: src/cddb.c:703
+#: src/cddb.c:702
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1200,36 +1217,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:713
+#: src/cddb.c:709
 msgid "Set Into :"
 msgstr "設定條件 :"
 
-#: src/cddb.c:720
+#: src/cddb.c:716
 msgid "All"
 msgstr "全部"
 
-#: src/cddb.c:727
+#: src/cddb.c:723
 msgid "Track #"
 msgstr "曲目編號"
 
-#: src/cddb.c:728
+#: src/cddb.c:724
 msgid "# Tracks"
 msgstr "曲目總數"
 
 #. Check box to run the scanner
-#: src/cddb.c:766 src/misc.c:2969
+#: src/cddb.c:762 src/misc.c:2997
 msgid "Run the current scanner for each file"
 msgstr "對每個檔案執行目前的掃瞄"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:773
+#: src/cddb.c:769
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "以 Levenshtein 演算法比對近似項目"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:778 src/prefs.c:1369
+#: src/cddb.c:774 src/prefs.c:1375
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1241,15 +1258,15 @@ msgstr ""
 "錄中尋找檔名有無和 CDDB 相似的曲名,並選擇最類似的項目。此選項可用在已選取正"
 "確的檔案後,不使用 CDDB 的結果,而直接採用曲目順序套用。"
 
-#: src/cddb.c:790
+#: src/cddb.c:786
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "載入已選的項目或所有項目 (如果未選擇)。"
 
-#: src/cddb.c:799 src/misc.c:2206
+#: src/cddb.c:795 src/misc.c:2224
 msgid "Ready to search..."
 msgstr "已準備好搜尋 ..."
 
-#: src/cddb.c:1319
+#: src/cddb.c:1315
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1257,76 +1274,80 @@ msgstr ""
 "專輯:「%s」,演唱者:「%s」,曲目長度:「%s」,發行年份:「%s」,曲風:「%s」,編"
 "號:「%s」"
 
-#: src/cddb.c:1509
+#: src/cddb.c:1505
 msgid "Invert selection"
 msgstr "反向選擇"
 
-#: src/cddb.c:1517
+#: src/cddb.c:1513
 msgid "Sort by Track Number"
 msgstr "依曲目編號排序"
 
-#: src/cddb.c:1522
+#: src/cddb.c:1518
 msgid "Sort by Track Name"
 msgstr "依曲名排序"
 
-#: src/cddb.c:1620
+#: src/cddb.c:1616
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "解析主機名稱「%s」中..."
 
-#: src/cddb.c:1628
+#: src/cddb.c:1624
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "無法解析主機名稱「%s」(%s)!"
 
-#: src/cddb.c:1643
+#: src/cddb.c:1639
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "無法建立新 Socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1657
+#: src/cddb.c:1653
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "連線到主機「%s」,埠「%d」 ..."
 
-#: src/cddb.c:1664
+#: src/cddb.c:1660
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "無法連線主機「%s」(%s)!"
 
-#: src/cddb.c:1670
+#: src/cddb.c:1666
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "已連線主機「%s」"
 
-#: src/cddb.c:1759
+#: src/cddb.c:1755
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "接收資料 (%s) 中 ..."
 
-#: src/cddb.c:1771
+#: src/cddb.c:1767
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "讀取 CDDB 回應時錯誤 (%s)!"
 
-#: src/cddb.c:1777
+#: src/cddb.c:1773
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "無法建立檔案「%s」 (%s)"
 
-#: src/cddb.c:1826 src/misc.c:3124 src/setting.c:1364
+#: src/cddb.c:1823 src/misc.c:3152 src/setting.c:1369
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "無法開啟檔案「%s」 (%s)"
 
-#. g_print("Request : '%s'\n", cddb_in);
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2261 src/cddb.c:2580 src/cddb.c:3417
+#: src/cddb.c:2265 src/cddb.c:2585 src/cddb.c:3448
 msgid "Sending request ..."
 msgstr "送出要求中 ..."
 
-#: src/cddb.c:2265 src/cddb.c:2584 src/cddb.c:3145 src/cddb.c:3421
+#: src/cddb.c:2269 src/cddb.c:2589 src/cddb.c:3153 src/cddb.c:3452
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "無法送出要求 (%s)!"
@@ -1335,62 +1356,63 @@ msgstr "無法送出要求 (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2287 src/cddb.c:3158 src/cddb.c:3430
+#: src/cddb.c:2291 src/cddb.c:3166 src/cddb.c:3461
 msgid "Receiving data ..."
 msgstr "接收資料中 ..."
 
-#: src/cddb.c:2294 src/cddb.c:2613 src/cddb.c:3165 src/cddb.c:3437
+#: src/cddb.c:2298 src/cddb.c:2618 src/cddb.c:3173 src/cddb.c:3468
 msgid "The server returned a wrong answer!"
 msgstr "伺服器回傳錯誤的回應!"
 
-#: src/cddb.c:2308 src/cddb.c:2629 src/cddb.c:3180 src/cddb.c:3452
+#: src/cddb.c:2312 src/cddb.c:2634 src/cddb.c:3188 src/cddb.c:3485
+#: src/cddb.c:3500
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "伺服器回傳錯誤的回應!(%s)"
 
-#: src/cddb.c:2455
+#: src/cddb.c:2459
 msgid "Sorry, the web-based search is currently down!"
 msgstr "抱歉,網頁搜尋目前無法使用!"
 
-#: src/cddb.c:2457 src/cddb.c:2801
+#: src/cddb.c:2461 src/cddb.c:2806
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "找到 %d 個符合的專輯"
 
-#: src/cddb.c:2601
+#: src/cddb.c:2606
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "接收第 %d 頁的資料 (專輯 %d/%d)..."
 
-#: src/cddb.c:2603
+#: src/cddb.c:2608
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "接收第 %d 頁的資料 ..."
 
-#: src/cddb.c:2768
+#: src/cddb.c:2773
 msgid "More results to load ..."
 msgstr "載入更多結果 ..."
 
-#: src/cddb.c:2897
+#: src/cddb.c:2902
 msgid "No file selected!"
 msgstr "沒有選擇檔案!"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: src/cddb.c:2905
+#: src/cddb.c:2910
 msgid "More than 99 files selected! Can't send request!"
 msgstr "已選取超過 99 個檔案,無法送出要求!"
 
-#: src/cddb.c:2911
+#: src/cddb.c:2916
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "已選擇 %d 個檔案!"
 
-#: src/cddb.c:2986
+#: src/cddb.c:2991
 msgid "Local CD search..."
 msgstr "本機 CD 搜尋 ..."
 
-#: src/cddb.c:2990
+#: src/cddb.c:2995
 #, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
@@ -1399,28 +1421,28 @@ msgstr ""
 "「本機 CD 資料庫」路徑尚未指定!\n"
 "請於偏好視窗中填入。"
 
-#. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3135
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: src/cddb.c:3143
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "送出要求中 (CddbId: %s, 曲目總數: %d, 總長度: %d) ..."
 
-#: src/cddb.c:3288
+#: src/cddb.c:3296
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "找到 %d 個符合 DiscID「%s」的專輯"
 
-#: src/cddb.c:3384
+#: src/cddb.c:3392
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "無法載入檔案:「%s」(%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3642
+#: src/cddb.c:3691
 msgid "Loading album track list ..."
 msgstr "載入專輯曲目清單中 ..."
 
-#: src/cddb.c:3839
+#: src/cddb.c:3888
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1432,7 +1454,7 @@ msgstr ""
 "\n"
 "你確定要繼續嗎?"
 
-#: src/cddb.c:3842
+#: src/cddb.c:3891
 msgid "Write Tag from CDDB..."
 msgstr "從 CDDB 寫入標籤 ..."
 
@@ -1690,7 +1712,7 @@ msgstr "參數或路徑「%s」無效\n"
 msgid "Browser"
 msgstr "瀏覽"
 
-#: src/easytag.c:455 src/et_core.c:2634
+#: src/easytag.c:455 src/et_core.c:2692
 msgid "File"
 msgstr "檔案"
 
@@ -1704,11 +1726,11 @@ msgstr "檔案連結失效"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:498 src/easytag.c:4417 src/mpeg_header.c:354
+#: src/easytag.c:498 src/easytag.c:4460 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:500 src/easytag.c:4418
+#: src/easytag.c:500 src/easytag.c:4461
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
@@ -1716,7 +1738,7 @@ msgstr "?, Layer ?"
 msgid "Bitrate:"
 msgstr "位元率:"
 
-#: src/easytag.c:507 src/easytag.c:4419
+#: src/easytag.c:507 src/easytag.c:4462
 msgid "? kb/s"
 msgstr "? kb/秒"
 
@@ -1724,17 +1746,17 @@ msgstr "? kb/秒"
 msgid "Freq:"
 msgstr "頻率:"
 
-#: src/easytag.c:514 src/easytag.c:4420
+#: src/easytag.c:514 src/easytag.c:4463
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:522 src/easytag.c:4421 src/mpeg_header.c:377
+#: src/easytag.c:522 src/easytag.c:4464 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "模式:"
 
-#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4422 src/easytag.c:4423
-#: src/easytag.c:4424
+#: src/easytag.c:524 src/easytag.c:538 src/easytag.c:4465 src/easytag.c:4466
+#: src/easytag.c:4467
 msgid "?"
 msgstr "?"
 
@@ -1751,7 +1773,7 @@ msgid "Time:"
 msgstr "時間:"
 
 #. Main Frame
-#: src/easytag.c:582 src/et_core.c:2572
+#: src/easytag.c:582 src/et_core.c:2630
 msgid "Tag"
 msgstr "標籤"
 
@@ -1780,330 +1802,350 @@ msgstr "演唱者:"
 msgid "Tag selected files with this artist"
 msgstr "以此演場者標記所選檔案"
 
-#. Album
+#. Album Artist
 #: src/easytag.c:654
+#, fuzzy
+msgid "Album Artist:"
+msgstr "演唱者:"
+
+#: src/easytag.c:666
+#, fuzzy
+msgid "Tag selected files with this album artist"
+msgstr "以此演場者標記所選檔案"
+
+#. Album
+#: src/easytag.c:672
 msgid "Album:"
 msgstr "專輯:"
 
-#: src/easytag.c:667
+#: src/easytag.c:685
 msgid "Tag selected files with this album name"
 msgstr "以此專輯名稱標記所選檔案"
 
 #. Disc Number
-#: src/easytag.c:673
+#: src/easytag.c:691
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:689
+#: src/easytag.c:707
 msgid "Tag selected files with this disc number"
 msgstr "以此碟片編號標記所選檔案"
 
 #. Year
-#: src/easytag.c:695
+#: src/easytag.c:713
 msgid "Year:"
 msgstr "年份:"
 
-#: src/easytag.c:712
+#: src/easytag.c:730
 msgid "Tag selected files with this year"
 msgstr "以此發行年份標記所選檔案"
 
-#: src/easytag.c:724
+#: src/easytag.c:742
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "為所選曲目依序編號,每個子目錄從 01 開始。"
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:733
+#: src/easytag.c:751
 msgid "Track #:"
 msgstr "曲目 #:"
 
-#: src/easytag.c:759
+#: src/easytag.c:777
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr "設定曲目總數,以相同目錄中顯示的檔案計算。"
 
-#: src/easytag.c:778
+#: src/easytag.c:796
 msgid "Tag selected files with this number of tracks"
 msgstr "以此曲目編號標記所選檔案"
 
 #. Genre
-#: src/easytag.c:784
+#: src/easytag.c:802
 msgid "Genre:"
 msgstr "曲風:"
 
-#: src/easytag.c:809
+#: src/easytag.c:827
 msgid "Tag selected files with this genre"
 msgstr "以此曲風標記所選檔案"
 
 #. Comment
-#: src/easytag.c:815
+#: src/easytag.c:833
 msgid "Comment:"
 msgstr "備註:"
 
-#: src/easytag.c:840
+#: src/easytag.c:858
 msgid "Tag selected files with this comment"
 msgstr "以此備註標記所選檔案"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:849
+#: src/easytag.c:867
 msgid "Composer:"
 msgstr "作曲者:"
 
-#: src/easytag.c:861
+#: src/easytag.c:879
 msgid "Tag selected files with this composer"
 msgstr "以此作曲者標記所選檔案"
 
 #. Original Artist / Performer
-#: src/easytag.c:868
+#: src/easytag.c:886
 msgid "Orig. Artist:"
 msgstr "原唱者:"
 
-#: src/easytag.c:880
+#: src/easytag.c:898
 msgid "Tag selected files with this original artist"
 msgstr "以此原唱者記所選檔案"
 
 #. Copyright
-#: src/easytag.c:887
+#: src/easytag.c:905
 msgid "Copyright:"
 msgstr "版權所有者:"
 
-#: src/easytag.c:899
+#: src/easytag.c:917
 msgid "Tag selected files with this copyright"
 msgstr "以此版權所有者標記所選檔案"
 
 #. URL
-#: src/easytag.c:906
+#: src/easytag.c:924
 msgid "URL:"
 msgstr "網址:"
 
-#: src/easytag.c:918
+#: src/easytag.c:936
 msgid "Tag selected files with this URL"
 msgstr "以此網址標記所選檔案"
 
 #. Encoded by
-#: src/easytag.c:925
+#: src/easytag.c:943
 msgid "Encoded by:"
 msgstr "編碼程式:"
 
-#: src/easytag.c:937
+#: src/easytag.c:955
 msgid "Tag selected files with this encoder name"
 msgstr "以此編碼程式標記所選檔案"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:997
+#: src/easytag.c:1018
 msgid "Pictures"
 msgstr "封面"
 
 #. Picture
-#: src/easytag.c:1008
+#: src/easytag.c:1029
 msgid "Pictures:"
 msgstr "封面:"
 
-#: src/easytag.c:1028
+#: src/easytag.c:1049
 msgid "You can use drag and drop to add picture."
 msgstr "你可以拖放圖片到這裡新增封面。"
 
-#: src/easytag.c:1066
+#: src/easytag.c:1087
 msgid "Tag selected files with these pictures"
 msgstr "以此封面標記所選檔案"
 
-#: src/easytag.c:1076
+#: src/easytag.c:1097
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "新增封面圖片 (也可以拖放圖片到這裡)"
 
-#: src/easytag.c:1082
+#: src/easytag.c:1103
 msgid "Remove selected pictures, else all pictures."
 msgstr "移除所選圖片,不選則全部刪除"
 
-#: src/easytag.c:1092
+#: src/easytag.c:1113
 msgid "Save the selected pictures on the hard disk."
 msgstr "儲存已選圖片到硬碟。"
 
-#: src/easytag.c:1099
+#: src/easytag.c:1120
 msgid "Set properties of the selected pictures."
 msgstr "設定已選圖片的屬性。"
 
-#: src/easytag.c:1179
+#: src/easytag.c:1200
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "所選的檔案已用曲名「%s」標記。"
 
-#: src/easytag.c:1181
+#: src/easytag.c:1202
 msgid "Removed title from selected files."
 msgstr "所選的檔案曲名已移除。"
 
-#: src/easytag.c:1198
+#: src/easytag.c:1219
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "所選的檔案已用演唱者「%s」標記。"
 
-#: src/easytag.c:1200
+#: src/easytag.c:1221
 msgid "Removed artist from selected files."
 msgstr "所選的檔案演唱者已移除。"
 
-#: src/easytag.c:1217
+#: src/easytag.c:1238
+#, fuzzy, c-format
+msgid "Selected files tagged with album artist '%s'."
+msgstr "所選的檔案已用演唱者「%s」標記。"
+
+#: src/easytag.c:1240
+#, fuzzy
+msgid "Removed album artist from selected files."
+msgstr "所選的檔案演唱者已移除。"
+
+#: src/easytag.c:1257
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "所選的檔案已用專輯「%s」標記。"
 
-#: src/easytag.c:1219
+#: src/easytag.c:1259
 msgid "Removed album name from selected files."
 msgstr "所選的檔案專輯名稱已移除。"
 
-#: src/easytag.c:1236
+#: src/easytag.c:1276
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "所選的檔案已用曲目編號「%s」標記。"
 
-#: src/easytag.c:1238
+#: src/easytag.c:1278
 msgid "Removed disc number from selected files."
 msgstr "所選的檔案曲名編號已移除。"
 
-#: src/easytag.c:1255
+#: src/easytag.c:1295
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "所選的檔案已用發行年份「%s」標記。"
 
-#: src/easytag.c:1257
+#: src/easytag.c:1297
 msgid "Removed year from selected files."
 msgstr "所選的檔案發行年份已移除。"
 
-#: src/easytag.c:1285 src/easytag.c:1381
+#: src/easytag.c:1325 src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "所選的檔案已用曲目編號「xx/%s」的方式標記。"
 
-#: src/easytag.c:1288
+#: src/easytag.c:1328
 msgid "Selected files tagged with track like 'xx'."
 msgstr "所選的檔案已用曲目編號「xx」的方式標記。"
 
-#: src/easytag.c:1292 src/easytag.c:1384
+#: src/easytag.c:1332 src/easytag.c:1424
 msgid "Removed track number from selected files."
 msgstr "所選的檔案曲目編號已移除。"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1350
+#: src/easytag.c:1390
 msgid "Selected tracks numbered sequentially."
 msgstr "所選的檔案已依序標記曲目編號。"
 
-#: src/easytag.c:1402
+#: src/easytag.c:1442
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "所選的檔案已用曲風「%s」標記。"
 
-#: src/easytag.c:1404
+#: src/easytag.c:1444
 msgid "Removed genre from selected files."
 msgstr "所選的檔案曲風已移除。"
 
-#: src/easytag.c:1428
+#: src/easytag.c:1468
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "所選的檔案已用備註「%s」標記。"
 
-#: src/easytag.c:1430
+#: src/easytag.c:1470
 msgid "Removed comment from selected files."
 msgstr "所選的檔案備註已移除。"
 
-#: src/easytag.c:1447
+#: src/easytag.c:1487
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "所選的檔案已用作曲者「%s」標記。"
 
-#: src/easytag.c:1449
+#: src/easytag.c:1489
 msgid "Removed composer from selected files."
 msgstr "所選的檔案作曲者已移除。"
 
-#: src/easytag.c:1466
+#: src/easytag.c:1506
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "所選的檔案已用原唱者「%s」標記。"
 
-#: src/easytag.c:1468
+#: src/easytag.c:1508
 msgid "Removed original artist from selected files."
 msgstr "所選的檔案原唱者已移除。"
 
-#: src/easytag.c:1485
+#: src/easytag.c:1525
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "所選的檔案已用版權所有者「%s」標記。"
 
-#: src/easytag.c:1487
+#: src/easytag.c:1527
 msgid "Removed copyright from selected files."
 msgstr "所選的檔案版權所有者已移除。"
 
-#: src/easytag.c:1504
+#: src/easytag.c:1544
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "所選的檔案已用網址「%s」標記。"
 
-#: src/easytag.c:1506
+#: src/easytag.c:1546
 msgid "Removed URL from selected files."
 msgstr "所選的檔案網址已移除。"
 
-#: src/easytag.c:1523
+#: src/easytag.c:1563
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "所選的檔案已用編碼程式「%s」標記。"
 
-#: src/easytag.c:1525
+#: src/easytag.c:1565
 msgid "Removed encoder name from selected files."
 msgstr "所選的檔案編碼程式已移除。"
 
-#: src/easytag.c:1560
+#: src/easytag.c:1600
 msgid "Selected files tagged with pictures."
 msgstr "所選的檔案封面已標記。"
 
-#: src/easytag.c:1562
+#: src/easytag.c:1602
 msgid "Removed pictures from selected files."
 msgstr "所選的檔案封面已移除。"
 
-#: src/easytag.c:1801
+#: src/easytag.c:1841
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "請選擇模式和遮罩條件後重做相同動作"
 
-#: src/easytag.c:1856
+#: src/easytag.c:1896
 msgid "All tags have been scanned"
 msgstr "已掃描所有標籤"
 
-#: src/easytag.c:1913
+#: src/easytag.c:1953
 msgid "All tags have been removed"
 msgstr "已移除所有標籤"
 
-#: src/easytag.c:2200
+#: src/easytag.c:2240
 #, c-format
 msgid ""
-"Be careful, severals files (%d file(s)) were changed by an external "
-"program.\n"
+"Be careful, several files (%d file(s)) were changed by an external program.\n"
 "Do you want to continue anyway?"
 msgstr ""
 
-#: src/easytag.c:2202
+#: src/easytag.c:2242
 #, fuzzy
 msgid "Saving File(s)..."
 msgstr "搜尋檔案 ..."
 
-#: src/easytag.c:2260 src/easytag.c:2281
+#: src/easytag.c:2300 src/easytag.c:2321
 msgid "Saving files was stopped..."
 msgstr ""
 
-#: src/easytag.c:2283
+#: src/easytag.c:2323
 msgid "All files have been saved..."
 msgstr "所有檔案已儲存..."
 
-#: src/easytag.c:2431
+#: src/easytag.c:2471
 msgid "Files have been partially deleted..."
 msgstr "檔案已部份刪除..."
 
-#: src/easytag.c:2433
+#: src/easytag.c:2473
 msgid "All files have been deleted..."
 msgstr "已刪除所有檔案..."
 
-#: src/easytag.c:2546
+#: src/easytag.c:2586
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2112,16 +2154,16 @@ msgstr ""
 "你要寫入檔案標籤\n"
 "「%s」嗎 ?"
 
-#: src/easytag.c:2550 src/easytag.c:2563
+#: src/easytag.c:2590 src/easytag.c:2603
 msgid "Write Tag..."
 msgstr "寫入標籤..."
 
 #. Directories and filename changed
-#: src/easytag.c:2638
+#: src/easytag.c:2678
 msgid "Rename File and Directory..."
 msgstr "檔案及目錄更名..."
 
-#: src/easytag.c:2639
+#: src/easytag.c:2679
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2135,11 +2177,11 @@ msgstr ""
 "「'%s」嗎?"
 
 #. Only directories changed
-#: src/easytag.c:2644
+#: src/easytag.c:2684
 msgid "Rename Directory..."
 msgstr "目錄更名..."
 
-#: src/easytag.c:2645
+#: src/easytag.c:2685
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2153,11 +2195,11 @@ msgstr ""
 "「'%s」嗎?"
 
 #. Only filename changed
-#: src/easytag.c:2651
+#: src/easytag.c:2691
 msgid "Rename File..."
 msgstr "檔案更名..."
 
-#: src/easytag.c:2652
+#: src/easytag.c:2692
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2170,17 +2212,17 @@ msgstr ""
 "為 \n"
 "「'%s」嗎?"
 
-#: src/easytag.c:2749
+#: src/easytag.c:2789
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "寫入「%s」的標籤中"
 
-#: src/easytag.c:2755
+#: src/easytag.c:2795
 msgid "Tag(s) written"
 msgstr "標籤已寫入"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2764 src/easytag.c:2771
+#: src/easytag.c:2804 src/easytag.c:2811
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2189,21 +2231,21 @@ msgstr ""
 "無法寫入標籤到檔案「%s」!\n"
 "(%s)"
 
-#: src/easytag.c:2766 src/easytag.c:2773
+#: src/easytag.c:2806 src/easytag.c:2813
 #, fuzzy, c-format
 msgid "Can't write tag in file '%s'! (%s)"
 msgstr ""
 "無法寫入標籤到檔案「%s」!\n"
 "(%s)"
 
-#: src/easytag.c:2917
+#: src/easytag.c:2957
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "檔案「%s」更名中"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2937 src/easytag.c:2983 src/easytag.c:3245
+#: src/easytag.c:2977 src/easytag.c:3023 src/easytag.c:3285
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2216,7 +2258,7 @@ msgstr ""
 "「%s」!\n"
 "(%s)"
 
-#: src/easytag.c:2939 src/easytag.c:2985 src/easytag.c:3247
+#: src/easytag.c:2979 src/easytag.c:3025 src/easytag.c:3287
 #, fuzzy, c-format
 msgid "Can't rename file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2225,11 +2267,11 @@ msgstr ""
 "「%s」!\n"
 "(%s)"
 
-#: src/easytag.c:2959 src/easytag.c:3005 src/easytag.c:3034 src/easytag.c:3267
+#: src/easytag.c:2999 src/easytag.c:3045 src/easytag.c:3074 src/easytag.c:3307
 msgid "File(s) not renamed..."
 msgstr "檔案未更名..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3052
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2242,7 +2284,7 @@ msgstr ""
 "因為下列檔案已存在:\n"
 "「%s」"
 
-#: src/easytag.c:3014
+#: src/easytag.c:3054
 #, fuzzy, c-format
 msgid "Can't rename file '%s' because the following file already exists: '%s'"
 msgstr ""
@@ -2251,7 +2293,7 @@ msgstr ""
 "因為下列檔案已存在:\n"
 "「%s」"
 
-#: src/easytag.c:3057
+#: src/easytag.c:3097
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2262,7 +2304,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:3059
+#: src/easytag.c:3099
 #, fuzzy, c-format
 msgid "Can't create target directory '%s'! (%s)"
 msgstr ""
@@ -2271,16 +2313,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3093
+#: src/easytag.c:3133
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "檔案「%s」已更名為「%s」"
 
-#: src/easytag.c:3099
+#: src/easytag.c:3139
 msgid "File(s) renamed..."
 msgstr "檔案已更名..."
 
-#: src/easytag.c:3109 src/easytag.c:3170
+#: src/easytag.c:3149 src/easytag.c:3210
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2291,7 +2333,7 @@ msgstr ""
 "「%s」!\n"
 "(%s)"
 
-#: src/easytag.c:3111 src/easytag.c:3172
+#: src/easytag.c:3151 src/easytag.c:3212
 #, fuzzy, c-format
 msgid "Can't remove old directory '%s'! (%s)"
 msgstr ""
@@ -2300,17 +2342,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:3154
+#: src/easytag.c:3194
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "檔案「%s」已移動到「%s」"
 
-#: src/easytag.c:3160
+#: src/easytag.c:3200
 msgid "File(s) moved..."
 msgstr "檔案已移動..."
 
 #. Moving file has failed
-#: src/easytag.c:3206
+#: src/easytag.c:3246
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2323,7 +2365,7 @@ msgstr ""
 "「%s」!\n"
 "(%s)"
 
-#: src/easytag.c:3208
+#: src/easytag.c:3248
 #, fuzzy, c-format
 msgid "Can't move file '%s' to '%s'! (%s)"
 msgstr ""
@@ -2332,11 +2374,11 @@ msgstr ""
 "「%s」!\n"
 "(%s)"
 
-#: src/easytag.c:3228
+#: src/easytag.c:3268
 msgid "File(s) not moved..."
 msgstr "檔案未移動..."
 
-#: src/easytag.c:3306
+#: src/easytag.c:3346
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2345,16 +2387,16 @@ msgstr ""
 "你確定要永遠刪除檔案\n"
 "「%s」嗎?"
 
-#: src/easytag.c:3309 src/easytag.c:3322
+#: src/easytag.c:3349 src/easytag.c:3362
 msgid "Delete File..."
 msgstr "刪除檔案..."
 
-#: src/easytag.c:3350
+#: src/easytag.c:3390
 #, c-format
 msgid "File '%s' deleted"
 msgstr "檔案「%s」已刪除"
 
-#: src/easytag.c:3485
+#: src/easytag.c:3525
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2366,109 +2408,108 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3513
+#: src/easytag.c:3553
 msgid "Search in progress..."
 msgstr "搜尋進行中..."
 
-#: src/easytag.c:3530 src/et_core.c:2641
+#: src/easytag.c:3570 src/et_core.c:2699
 #, c-format
 msgid "File: '%s'"
 msgstr "檔案:「%s」"
 
-#: src/easytag.c:3580
+#: src/easytag.c:3620
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "於此目錄及其子目錄中找到 %d 個檔案。"
 
-#: src/easytag.c:3582
+#: src/easytag.c:3622
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr "於此目錄中找到 %d 個檔案。"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3595 src/et_core.c:2725
+#: src/easytag.c:3635 src/et_core.c:2783
 #, c-format
 msgid "%u file(s)"
 msgstr "%u 個檔案"
 
-#: src/easytag.c:3601
+#: src/easytag.c:3641
 msgid "No file found in this directory and subdirectories!"
 msgstr "於此目錄及其子目錄中找不到檔案!"
 
-#: src/easytag.c:3603
+#: src/easytag.c:3643
 msgid "No file found in this directory!"
 msgstr "於此目錄中找不到檔案!"
 
-#: src/easytag.c:3691
+#: src/easytag.c:3731
 msgid "Searching..."
 msgstr "搜尋中..."
 
 #. Button to stop...
-#: src/easytag.c:3711
+#: src/easytag.c:3751
 msgid "  STOP the search...  "
 msgstr "  「停止」搜尋...  "
 
-#. Open the last selected scanner
-#: src/easytag.c:4444
+#: src/easytag.c:4493
 msgid "Select a directory to browse!"
 msgstr "請選擇要瀏覽的目錄!"
 
 #. Menu items
-#: src/easytag.c:4580
+#: src/easytag.c:4624
 msgid "Tag selected files with this field"
 msgstr "所選的檔案已用此欄位標記。"
 
-#: src/easytag.c:4591
+#: src/easytag.c:4635
 msgid "Convert '_' and '%20' to spaces"
 msgstr "轉換「_」及「%20」為空格"
 
-#: src/easytag.c:4598 src/scan.c:2639
+#: src/easytag.c:4642 src/scan.c:2665
 msgid "Convert ' ' to '_'"
 msgstr "轉換「 」為「_」"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4609 src/scan.c:2690
+#: src/easytag.c:4653 src/scan.c:2716
 msgid "All uppercase"
 msgstr "全部大寫"
 
-#: src/easytag.c:4616 src/scan.c:2691
+#: src/easytag.c:4660 src/scan.c:2717
 msgid "All downcase"
 msgstr "全部小寫"
 
-#: src/easytag.c:4623 src/scan.c:2692
+#: src/easytag.c:4667 src/scan.c:2718
 msgid "First letter uppercase"
 msgstr "第一個字母大寫"
 
-#: src/easytag.c:4630 src/scan.c:2693
+#: src/easytag.c:4674 src/scan.c:2719
 msgid "First letter uppercase of each word"
 msgstr "每個字的第一個字母大寫"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4641 src/scan.c:2741
+#: src/easytag.c:4685 src/scan.c:2767
 msgid "Remove spaces"
 msgstr "移除空格"
 
-#: src/easytag.c:4648
+#: src/easytag.c:4692
 msgid "Insert space before uppercase letter"
 msgstr "在大寫字母前插入空格"
 
-#: src/easytag.c:4655
+#: src/easytag.c:4699
 msgid "Remove duplicate spaces or underscores"
 msgstr "移除重複的空格或底線"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4675 src/easytag.c:4683
+#: src/easytag.c:4719 src/easytag.c:4727
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: 異常結束! (PId: %d)。"
 
-#: src/easytag.c:4676 src/easytag.c:4685
+#: src/easytag.c:4720 src/easytag.c:4729
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "已接收信號 %s (%d)\a"
 
-#: src/easytag.c:4678 src/easytag.c:4687
+#: src/easytag.c:4722 src/easytag.c:4731
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
 "gdb backtrace ('gdb easytag core' then 'bt' and 'l') and informations to "
@@ -2478,11 +2519,11 @@ msgstr ""
 "「gdb easytag core」後打「bt」及「l」) 後將所得資訊及重現此錯誤的方法寄到 "
 "easytag at gmail.com"
 
-#: src/easytag.c:4814
+#: src/easytag.c:4858
 msgid "Unknown signal"
 msgstr "未知的信號"
 
-#: src/easytag.c:4830
+#: src/easytag.c:4874
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2516,11 +2557,11 @@ msgstr ""
 "path_to/files     使用相對路徑。\n"
 "\n"
 
-#: src/easytag.c:4858
+#: src/easytag.c:4902
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: 正常結束。"
 
-#: src/easytag.c:4903
+#: src/easytag.c:4947
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2528,82 +2569,82 @@ msgstr ""
 "某些檔案已變更但尚未儲存...\n"
 "你要在結束程式前儲存檔案嗎?"
 
-#: src/easytag.c:4930
+#: src/easytag.c:4974
 msgid " Do you really want to exit the program? "
 msgstr "你確定要結束本程式嗎?"
 
-#: src/et_core.c:631
+#: src/et_core.c:632
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: src/et_core.c:2538
+#: src/et_core.c:2596
 msgid "ID3 Tag"
 msgstr "ID3 標籤"
 
-#: src/et_core.c:2544
+#: src/et_core.c:2602
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis 標籤"
 
-#: src/et_core.c:2550
+#: src/et_core.c:2608
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis 標籤"
 
-#: src/et_core.c:2555
+#: src/et_core.c:2613
 msgid "APE Tag"
 msgstr "APE 標籤"
 
-#: src/et_core.c:2560
+#: src/et_core.c:2618
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC 標籤"
 
-#: src/et_core.c:2566
+#: src/et_core.c:2624
 msgid "Wavpack Tag"
 msgstr "Wavpack 標籤"
 
-#: src/et_core.c:2586
+#: src/et_core.c:2644
 msgid "MP3 File"
 msgstr "MP3 檔案"
 
-#: src/et_core.c:2590
+#: src/et_core.c:2648
 msgid "MP2 File"
 msgstr "MP2 檔案"
 
-#: src/et_core.c:2596
+#: src/et_core.c:2654
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis 檔案"
 
-#: src/et_core.c:2602
+#: src/et_core.c:2660
 msgid "Speex File"
 msgstr "Speex 檔案"
 
-#: src/et_core.c:2608
+#: src/et_core.c:2666
 msgid "FLAC File"
 msgstr "FLAC 檔案"
 
-#: src/et_core.c:2613
+#: src/et_core.c:2671
 msgid "MusePack File"
 msgstr "MusePack 檔案"
 
-#: src/et_core.c:2617
+#: src/et_core.c:2675
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio 檔案"
 
-#: src/et_core.c:2622
+#: src/et_core.c:2680
 msgid "MP4/AAC File"
 msgstr "MP4/AAC 檔案"
 
-#: src/et_core.c:2628
+#: src/et_core.c:2686
 msgid "Wavpack File"
 msgstr "Wavpack 檔案"
 
-#: src/et_core.c:2902
+#: src/et_core.c:2969
 #, c-format
 msgid "Pictures (%d)"
 msgstr "圖片 (%d)"
 
 #. Bitrate
-#: src/et_core.c:2941 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/et_core.c:3008 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2611,14 +2652,14 @@ msgid "%d kb/s"
 msgstr "%d kb/秒"
 
 #. Samplerate
-#: src/et_core.c:2946 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/et_core.c:3013 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3086
+#: src/et_core.c:3153
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2629,11 +2670,11 @@ msgstr ""
 "為系統編碼\n"
 "(請試著設定環境變數 G_FILENAME_ENCODING)。"
 
-#: src/et_core.c:3089 src/scan.c:675
+#: src/et_core.c:3156 src/scan.c:676
 msgid "Filename translation"
 msgstr "檔名翻譯"
 
-#: src/et_core.c:4572 src/et_core.c:4580
+#: src/et_core.c:4671 src/et_core.c:4679
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "檔名「%s」的長度超過 %d 個字元,多餘的字元會被截斷!\n"
@@ -2657,54 +2698,54 @@ msgstr "編碼程式:"
 msgid "Channels:"
 msgstr "聲道:"
 
-#: src/flac_tag.c:139 src/flac_tag.c:811 src/flac_tag.c:821
+#: src/flac_tag.c:140 src/flac_tag.c:843 src/flac_tag.c:853
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "開啟檔案時錯誤: 「%s」為 FLAC (%s)。"
 
-#: src/flac_tag.c:298 src/ogg_tag.c:277
+#: src/flac_tag.c:327 src/ogg_tag.c:297
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
 "be lost while saving tag."
 msgstr ""
 
-#: src/flac_tag.c:1098
+#: src/flac_tag.c:1140
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: src/flac_tag.c:1132 src/ogg_tag.c:861
+#: src/flac_tag.c:1174 src/ogg_tag.c:890
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "錯誤: 寫入備註到檔案「%s」(%s) 失敗。"
 
-#: src/flac_tag.c:1137 src/ogg_tag.c:868
+#: src/flac_tag.c:1179 src/ogg_tag.c:897
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "「%s」標籤已寫入"
 
-#: src/id3_tag.c:488
+#: src/id3_tag.c:501
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "「%s」標籤已移除"
 
-#: src/id3_tag.c:492 src/id3_tag.c:595
+#: src/id3_tag.c:505 src/id3_tag.c:608
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "移除「%s」(%s) 的 ID3v1 標籤時錯誤"
 
-#: src/id3_tag.c:494 src/id3_tag.c:567
+#: src/id3_tag.c:507 src/id3_tag.c:580
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "移除「%s」(%s) 的 ID3v2 標籤時錯誤"
 
-#: src/id3_tag.c:513
+#: src/id3_tag.c:526
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "更新「%s」(%s) 的 ID3v2 標籤時錯誤"
 
-#: src/id3_tag.c:535
+#: src/id3_tag.c:548
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2727,77 +2768,77 @@ msgstr ""
 "\n"
 "File : %s"
 
-#: src/id3_tag.c:587
+#: src/id3_tag.c:600
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "更新「%s」(%s) 的 ID3v1 標籤時錯誤"
 
-#: src/id3_tag.c:601
+#: src/id3_tag.c:614
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "「%s」 標籤已更新"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:633
 msgid "No error reported"
 msgstr "無錯誤被回報"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:635
 msgid "No available memory"
 msgstr "記憶體不足"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:637
 msgid "No data to parse"
 msgstr "無資料可供解析"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:639
 msgid "Improperly formatted data"
 msgstr "不正確的格式化資料"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:641
 msgid "No buffer to write to"
 msgstr "無緩衝區以寫入到"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:643
 msgid "Buffer is too small"
 msgstr "緩衝區太小"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:645
 msgid "Invalid frame ID"
 msgstr "frame ID 無效"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:647
 msgid "Requested field not found"
 msgstr "找不到要求的欄位"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:649
 msgid "Unknown field type"
 msgstr "未知的檔案類型"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:651
 msgid "Tag is already attached to a file"
 msgstr "標籤已附加到檔案中"
 
-#: src/id3_tag.c:640
+#: src/id3_tag.c:653
 msgid "Invalid tag version"
 msgstr "標籤版本無校"
 
-#: src/id3_tag.c:642
+#: src/id3_tag.c:655
 msgid "No file to parse"
 msgstr "無檔案可供解析"
 
-#: src/id3_tag.c:644
+#: src/id3_tag.c:657
 msgid "Attempting to write to a read-only file"
 msgstr "試圖寫入唯讀檔案"
 
-#: src/id3_tag.c:646
+#: src/id3_tag.c:659
 msgid "Error in compression/uncompression"
 msgstr "壓縮╱解壓縮時錯誤"
 
-#: src/id3_tag.c:648
+#: src/id3_tag.c:661
 msgid "Unknown error message!"
 msgstr "未知的錯誤訊息!"
 
-#: src/id3_tag.c:1222
+#: src/id3_tag.c:1236
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2806,7 +2847,7 @@ msgstr ""
 "下列已毀損的檔案:「%s」\n"
 "導致 id3lib 產生錯誤,程式將不會處理此檔案。"
 
-#: src/id3_tag.c:1224
+#: src/id3_tag.c:1238
 msgid "Corrupted file..."
 msgstr "檔案已毀損..."
 
@@ -2814,74 +2855,74 @@ msgstr "檔案已毀損..."
 msgid "Log"
 msgstr "記錄"
 
-#: src/misc.c:773
+#: src/misc.c:778
 msgid "Select file..."
 msgstr "選擇檔案..."
 
-#: src/misc.c:778
+#: src/misc.c:783
 msgid "Select directory..."
 msgstr "選擇目錄..."
 
-#: src/misc.c:852
+#: src/misc.c:857
 msgid "Warning..."
 msgstr "警告..."
 
-#: src/misc.c:856
+#: src/misc.c:861
 msgid "No audio player defined!"
 msgstr "未指定播放程式!"
 
-#: src/misc.c:959
+#: src/misc.c:964
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr "無法執行 %s (%s)!\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1124 src/misc.c:1143
+#: src/misc.c:1129 src/misc.c:1148
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1238
+#: src/misc.c:1243
 msgid "Generate a playlist"
 msgstr "產生播放清單"
 
-#: src/misc.c:1262
+#: src/misc.c:1267
 msgid "M3U Playlist Name"
 msgstr "M3U 播放清單名稱"
 
-#: src/misc.c:1275
+#: src/misc.c:1280
 msgid "Use directory name"
 msgstr "使用目錄名稱"
 
-#: src/misc.c:1299 src/misc.c:1396
+#: src/misc.c:1304 src/misc.c:1401
 msgid "Edit Masks"
 msgstr "編輯遮罩條件"
 
 #. Playlist options
-#: src/misc.c:1307
+#: src/misc.c:1312
 msgid "Playlist Options"
 msgstr "播放清單選項"
 
-#: src/misc.c:1313
+#: src/misc.c:1318
 msgid "Include only the selected files"
 msgstr "只含選擇的檔案"
 
-#: src/misc.c:1316
+#: src/misc.c:1321
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2889,51 +2930,51 @@ msgstr ""
 "啟用此選項只會產生所選檔案的播放清單檔案。如不取用則會產生所有檔案的播放清"
 "單。"
 
-#: src/misc.c:1323
+#: src/misc.c:1328
 msgid "Use full path for files in playlist"
 msgstr "使用完整路徑產生播放清單"
 
-#: src/misc.c:1326
+#: src/misc.c:1331
 msgid "Use relative path for files in playlist"
 msgstr "使用相對路徑產生播放清單"
 
 #. Create playlist in parent directory
-#: src/misc.c:1336
+#: src/misc.c:1341
 msgid "Create playlist in the parent directory"
 msgstr "建立播放清單於上層目錄"
 
-#: src/misc.c:1339
+#: src/misc.c:1344
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "啟用此選項則播放清單會產生於父目錄 (上層目錄)"
 
 #. DOS Separator
-#: src/misc.c:1343
+#: src/misc.c:1348
 msgid "Use DOS directory separator"
 msgstr "使用 DOS 目錄分隔字元"
 
-#: src/misc.c:1348
+#: src/misc.c:1353
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "此選項會用 DOS 格式的「\\」分隔字元取代 UNIX 格式的「/」分隔字元。"
 
-#: src/misc.c:1357
+#: src/misc.c:1362
 msgid "Playlist Content"
 msgstr "播放清單內容"
 
-#: src/misc.c:1363
+#: src/misc.c:1368
 msgid "Write only list of files"
 msgstr "只列出檔案清單"
 
-#: src/misc.c:1367
+#: src/misc.c:1372
 msgid "Write info using filename"
 msgstr "用檔名寫入資訊"
 
-#: src/misc.c:1370
+#: src/misc.c:1375
 msgid "Write info using :"
 msgstr "寫入資訊以 :"
 
-#: src/misc.c:1631
+#: src/misc.c:1636
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2942,12 +2983,12 @@ msgstr ""
 "播放清單檔案「%s」已存在!\n"
 "要覆蓋嗎?"
 
-#: src/misc.c:1632
+#: src/misc.c:1637
 msgid "Write Playlist..."
 msgstr "寫入播放清單..."
 
 #. Writing fails...
-#: src/misc.c:1654
+#: src/misc.c:1659
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2956,136 +2997,136 @@ msgstr ""
 "無法寫入播放清單檔案「%s」!\n"
 "(%s)"
 
-#: src/misc.c:1667
+#: src/misc.c:1672
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "播放清單檔案「%s」已寫入"
 
-#: src/misc.c:1913
+#: src/misc.c:1919
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1922
+#: src/misc.c:1928
 msgid "Encoded by"
 msgstr "編碼程式"
 
-#: src/misc.c:1933
+#: src/misc.c:1939
 msgid "Search a file"
 msgstr "搜尋檔案"
 
-#: src/misc.c:1973
+#: src/misc.c:1979
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "請輸入要搜尋的文字,不輸入任何文字則會顯示所有檔案。"
 
 #. Where...
-#: src/misc.c:1979
+#: src/misc.c:1985
 msgid "In :"
 msgstr "æ–¼ :"
 
-#: src/misc.c:1982
+#: src/misc.c:1988
 msgid "the File Name"
 msgstr "檔名"
 
 #. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: src/misc.c:1984
+#: src/misc.c:1990
 msgid "the Tag"
 msgstr "標籤"
 
 #. Property of the search
-#: src/misc.c:1994 src/prefs.c:323
+#: src/misc.c:2000 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "大小寫相異"
 
-#: src/misc.c:2427
+#: src/misc.c:2449
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "找到 : %d 個檔案"
 
-#: src/misc.c:2695
+#: src/misc.c:2723
 msgid "Load the filenames from a TXT file"
 msgstr "從 TXT 檔載入檔名"
 
-#: src/misc.c:2725
+#: src/misc.c:2753
 msgid "File :"
 msgstr "檔案 :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2743
+#: src/misc.c:2771
 msgid " Load "
 msgstr " 讀取 "
 
-#: src/misc.c:2766
+#: src/misc.c:2794
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "檔案更名確認"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2787 src/misc.c:2881
+#: src/misc.c:2815 src/misc.c:2909
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "於大寫字母前插入空格"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2796 src/misc.c:2890
+#: src/misc.c:2824 src/misc.c:2918
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "刪除此項目"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2805 src/misc.c:2899 src/misc.c:3372
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3400
 msgid "Delete all blank lines"
 msgstr "刪除所有空白項目"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2817 src/misc.c:2911
+#: src/misc.c:2845 src/misc.c:2939
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "只含選擇的檔案"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2826 src/misc.c:2920
+#: src/misc.c:2854 src/misc.c:2948
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "只含選擇的檔案"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2838 src/misc.c:2932 src/misc.c:3396
+#: src/misc.c:2866 src/misc.c:2960 src/misc.c:3424
 msgid "Reload"
 msgstr "重新載入"
 
-#: src/misc.c:2859
+#: src/misc.c:2887
 #, fuzzy
 msgid "List of files"
 msgstr "只列出檔案清單"
 
-#: src/misc.c:2954
+#: src/misc.c:2982
 #, fuzzy
 msgid "Selected line:"
 msgstr "選擇所有項目"
 
-#: src/misc.c:2972
+#: src/misc.c:3000
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
 msgstr ""
 "啟用此選項會在檔案清單載入完成後,自動執行目前選擇的掃瞄 (掃瞄視窗必須打開)。"
 
-#: src/misc.c:3360
+#: src/misc.c:3388
 msgid "Insert a blank line"
 msgstr "插入空白項目"
 
-#: src/misc.c:3366
+#: src/misc.c:3394
 msgid "Delete this line"
 msgstr "刪除此項目"
 
-#: src/misc.c:3381
+#: src/misc.c:3409
 #, fuzzy
 msgid "Move up this line"
 msgstr "此遮罩向上移"
 
-#: src/misc.c:3387
+#: src/misc.c:3415
 #, fuzzy
 msgid "Move down this line"
 msgstr "此遮罩向下移"
@@ -3167,12 +3208,12 @@ msgid ""
 msgstr ""
 "Ogg Vorbis: 內部邏輯錯誤,可能是程式錯誤或 Heap/Stack 損壞 (檔案:「%s」)。"
 
-#: src/ogg_header.c:195 src/ogg_tag.c:186 src/ogg_tag.c:658
+#: src/ogg_header.c:195 src/ogg_tag.c:187 src/ogg_tag.c:679
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "錯誤: 開啟檔案時錯誤:「%s」為 vorbis (%s)。"
 
-#: src/ogg_tag.c:168
+#: src/ogg_tag.c:169
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "警告 : Ogg Vorbis 檔案「%s」包含 ID3v2 標籤。"
@@ -3758,7 +3799,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "強制使用系統編碼並使用相似字元"
 
-#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
+#: src/prefs.c:554 src/prefs.c:840 src/prefs.c:909
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3771,7 +3812,7 @@ msgid ""
 "characters"
 msgstr "強制使用系統編碼並刪除無法表示的字元"
 
-#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
+#: src/prefs.c:563 src/prefs.c:849 src/prefs.c:918
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3916,33 +3957,44 @@ msgstr "使用壓縮"
 msgid "Set Compression in the ID3v2 tags"
 msgstr "設定 ID3v2 標籤壓縮"
 
-#. Character Set for writing ID3 tag
+#. Write Genre in text
 #: src/prefs.c:718
+msgid "Write Genre in text only"
+msgstr ""
+
+#: src/prefs.c:721
+msgid ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
+msgstr ""
+
+#. Character Set for writing ID3 tag
+#: src/prefs.c:724
 msgid "Character Set for writing ID3 tags"
 msgstr "寫入 ID3 標籤的字元編碼"
 
 #. ID3v2 tags
-#: src/prefs.c:725
+#: src/prefs.c:731
 msgid "ID3v2 tags"
 msgstr "ID3v2 標籤"
 
 #. Write ID3v2 tag
-#: src/prefs.c:738
+#: src/prefs.c:744
 msgid "Write ID3v2 tag"
 msgstr "寫入 ID3v2 標籤"
 
-#: src/prefs.c:741
+#: src/prefs.c:747
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr "啟用此選項則會新增或更新 MP3 檔案開頭的 ID3v2.4 標籤,不選則會刪除。"
 
 #. ID3v2 tag version
-#: src/prefs.c:748
+#: src/prefs.c:754
 msgid "Version:"
 msgstr "版本: "
 
-#: src/prefs.c:755
+#: src/prefs.c:761
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3954,34 +4006,34 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:871
+#: src/prefs.c:775 src/prefs.c:877
 msgid "Charset:"
 msgstr "字元集:"
 
 #. Unicode
-#: src/prefs.c:777
+#: src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode "
 
-#: src/prefs.c:785
+#: src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "要使用的 Unicode 類型"
 
-#: src/prefs.c:808
+#: src/prefs.c:814
 msgid "Character set used to write the tag data in the file."
 msgstr "要寫入檔案標籤所用的字元集。"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:887
+#: src/prefs.c:824 src/prefs.c:893
 msgid "Additional settings for iconv():"
 msgstr "iconv() 的其他設定: "
 
-#: src/prefs.c:823 src/prefs.c:892
+#: src/prefs.c:829 src/prefs.c:898
 msgid "No"
 msgstr "ç„¡"
 
-#: src/prefs.c:826 src/prefs.c:895
+#: src/prefs.c:832 src/prefs.c:901
 #, fuzzy
 msgid ""
 "With this option, when a character cannot be represented in the target "
@@ -3989,52 +4041,52 @@ msgid ""
 "displayed for information."
 msgstr "此選項啟用後,當字元無法以目的編碼表示時,會用相似的字元代替。"
 
-#: src/prefs.c:831 src/prefs.c:900
+#: src/prefs.c:837 src/prefs.c:906
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:840 src/prefs.c:909
+#: src/prefs.c:846 src/prefs.c:915
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:848
+#: src/prefs.c:854
 msgid "ID3v1 tags"
 msgstr "ID3v1 標籤"
 
 #. Write ID3v1 tag
-#: src/prefs.c:862
+#: src/prefs.c:868
 msgid "Write ID3v1.x tag"
 msgstr "寫入 ID3v1.x 標籤"
 
-#: src/prefs.c:865
+#: src/prefs.c:871
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr "啟用此選項則會新增或更新 MP3 檔案尾端的 ID3v1 標籤,不選則會刪除。"
 
-#: src/prefs.c:882
+#: src/prefs.c:888
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "要寫入 ID3v1 檔案標籤所用的字元集。"
 
 #. Character Set for reading tag
-#: src/prefs.c:917
+#: src/prefs.c:923
 msgid "Character Set for reading ID3 tags"
 msgstr "讀取 ID3 標籤所用的字元集"
 
-#: src/prefs.c:931
+#: src/prefs.c:937
 msgid "Non-standart:"
 msgstr "非標準: "
 
-#: src/prefs.c:936
+#: src/prefs.c:942
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
 "For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an ISO-"
-"8859-1 field. This is not correct! To convert these tags to Unicode: "
+"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
@@ -4053,59 +4105,59 @@ msgstr ""
 "  - 如果無法使用 Unicode,俄文使用者可以選擇「Windows-1251」字元集讀取在 "
 "Windows 下寫入的標籤,選擇「KOI8-R」讀取在 Unix 系統下寫入的標籤。"
 
-#: src/prefs.c:954
+#: src/prefs.c:960
 msgid "Character set used to read tag data in the file."
 msgstr "要讀取檔案標籤所用的字元集。"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:969 src/prefs.c:970
+#: src/prefs.c:975 src/prefs.c:976
 msgid "Scanner"
 msgstr "掃描"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:982
+#: src/prefs.c:988
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "標籤填入掃描 - 字元轉換"
 
-#: src/prefs.c:988 src/prefs.c:1014
+#: src/prefs.c:994 src/prefs.c:1020
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "轉換底線字元「_」及字串「%20」為空格「 」"
 
-#: src/prefs.c:990 src/prefs.c:1016
+#: src/prefs.c:996 src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr "轉換空格「 」為底線「_」"
 
-#: src/prefs.c:1002 src/prefs.c:1004
+#: src/prefs.c:1008 src/prefs.c:1010
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr "啟用此選項,則標籤掃描要以遮罩套用時會使用此轉換規則。"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1008
+#: src/prefs.c:1014
 msgid "Rename File Scanner - Character Conversion"
 msgstr "檔案更名掃描 - 字元轉換"
 
-#: src/prefs.c:1028 src/prefs.c:1030
+#: src/prefs.c:1034 src/prefs.c:1036
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr "啟用此選項,則檔名掃描要以遮罩套用時會使用此轉換規則。"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1034
+#: src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "欄位處理掃描 - 字元轉換"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1041
+#: src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "某些介系詞和冠詞的第一個字母不要轉為大寫"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1051
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
 "words like feat., when using the scanner 'First letter uppercase of each "
@@ -4116,41 +4168,41 @@ msgstr ""
 "的第一個字母為大寫 (例如: 「Text In An Entry」會變成「Text in an Entry」。"
 
 #. Properties of the scanner window
-#: src/prefs.c:1051
+#: src/prefs.c:1057
 msgid "Scanner Window"
 msgstr "掃描視窗"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr "啟動時開啟掃描視窗"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "啟用此選項後,啟動 EasyTAG 時會自動開啟掃描視窗。"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1069
 msgid "Scanner window always on top"
 msgstr "掃描視窗永遠在最上層"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1072
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr "啟用此選項後,含遮罩條件的掃描視窗會永遠顯示在主視窗之上。"
 
 #. Other options
-#: src/prefs.c:1071
+#: src/prefs.c:1077
 msgid "Fields"
 msgstr "欄位"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1078
+#: src/prefs.c:1084
 msgid "Overwrite fields when scanning tag"
 msgstr "標籤掃描時覆蓋現有欄位"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1087
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
@@ -4158,22 +4210,22 @@ msgstr ""
 "啟用此選項後,標籤掃描會用新資料覆蓋已存在的欄位,若停用此選項,則只有空白欄"
 "位會填入新資料。"
 
-#: src/prefs.c:1092
+#: src/prefs.c:1098
 msgid "Set this text as default comment :"
 msgstr "設定要寫入備註的預設文字 :"
 
-#: src/prefs.c:1095
+#: src/prefs.c:1101
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr "啟用此選項,則使用「標籤填入」掃描時會自動於備註欄位寫入下列字串。"
 
 #. CRC32 comment
-#: src/prefs.c:1112
+#: src/prefs.c:1118
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "使用 CRC32 為預設的備註 (只對 ID3 標籤有效)"
 
-#: src/prefs.c:1116
+#: src/prefs.c:1122
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4182,42 +4234,42 @@ msgstr "當使用「標籤填入」掃描時計算檔案的 CRC-32 值並寫入
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1127 src/prefs.c:1128
+#: src/prefs.c:1133 src/prefs.c:1134
 msgid "CD Data Base"
 msgstr "CD 資料庫"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1137
+#: src/prefs.c:1143
 msgid "Server Settings for Automatic Search"
 msgstr "自動搜尋的伺服器設定"
 
-#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+#: src/prefs.c:1152 src/prefs.c:1191 src/prefs.c:1225
 msgid "Name :"
 msgstr "名稱 :"
 
-#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+#: src/prefs.c:1171 src/prefs.c:1199 src/prefs.c:1234 src/prefs.c:1322
 msgid "Port :"
 msgstr "埠 :"
 
-#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+#: src/prefs.c:1181 src/prefs.c:1209 src/prefs.c:1244
 msgid "CGI Path :"
 msgstr "CGI 路徑 :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1211
+#: src/prefs.c:1217
 msgid "Server Settings for Manual Search"
 msgstr "手動搜尋的伺服器設定"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1246
+#: src/prefs.c:1252
 msgid "Local CD Data Base"
 msgstr "本機 CD 資料庫"
 
-#: src/prefs.c:1254
+#: src/prefs.c:1260
 msgid "Path :"
 msgstr "路徑 :"
 
-#: src/prefs.c:1265
+#: src/prefs.c:1271
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4229,58 +4281,58 @@ msgstr ""
 "'soundtrack' 及 'misc'。"
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1291
+#: src/prefs.c:1297
 msgid "Proxy Settings"
 msgstr "Proxy 設定"
 
-#: src/prefs.c:1300
+#: src/prefs.c:1306
 msgid "Use a proxy"
 msgstr "使用 Proxy"
 
-#: src/prefs.c:1303
+#: src/prefs.c:1309
 msgid "Set active the settings of the proxy server."
 msgstr "設定有效 Proxy 伺服器的設定。"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1314
 msgid "Host Name :"
 msgstr "主機名稱 :"
 
-#: src/prefs.c:1315
+#: src/prefs.c:1321
 msgid "Name of the proxy server."
 msgstr "Proxy 伺服器名稱。"
 
-#: src/prefs.c:1323
+#: src/prefs.c:1329
 msgid "Port of the proxy server."
 msgstr "Proxy 伺服器埠號。"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1334
 msgid "User Name :"
 msgstr "使用者名稱 :"
 
-#: src/prefs.c:1335
+#: src/prefs.c:1341
 msgid "Name of user for the the proxy server."
 msgstr "Proxy 伺服器的使用者名稱。"
 
-#: src/prefs.c:1336
+#: src/prefs.c:1342
 msgid "User Password :"
 msgstr "使用者密碼 :"
 
-#: src/prefs.c:1344
+#: src/prefs.c:1350
 msgid "Password of user for the the proxy server."
 msgstr "Proxy 伺服器的使用者密碼。"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1349
+#: src/prefs.c:1355
 msgid "Track Name List"
 msgstr "曲名清單"
 
-#: src/prefs.c:1356
+#: src/prefs.c:1362
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "選擇相符的聲音檔案 (根據順序或 DLM)"
 
-#: src/prefs.c:1360
+#: src/prefs.c:1366
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
@@ -4288,7 +4340,7 @@ msgstr ""
 "若啟用此選項,當於曲名欄位中選擇項目時會自動於主清單選擇相符的聲音檔案。"
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1365
+#: src/prefs.c:1371
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4297,71 +4349,75 @@ msgstr "使用 Levenshtein 演算法 (DLM) 依檔名比對符合的曲名"
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1380 src/prefs.c:1381
+#: src/prefs.c:1386 src/prefs.c:1387
 msgid "Confirmation"
 msgstr "確認"
 
-#: src/prefs.c:1389
+#: src/prefs.c:1395
 msgid "Confirm exit from program"
 msgstr "離開程式確認"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1398
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "啟用此選項後在離開程式前會開啟對話方塊再次詢問。"
 
-#: src/prefs.c:1395
+#: src/prefs.c:1401
 msgid "Confirm writing of file tag"
 msgstr "寫入檔案標籤確認"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1405
 msgid "Confirm renaming of file"
 msgstr "檔案更名確認"
 
-#: src/prefs.c:1403
+#: src/prefs.c:1409
 msgid "Confirm deleting of file"
 msgstr "檔案刪除確認"
 
-#: src/prefs.c:1407
+#: src/prefs.c:1413
 msgid "Confirm writing of playlist"
 msgstr "寫入播放清單確認"
 
+#: src/prefs.c:1417
+msgid "Confirm changing directory when there are unsaved changes"
+msgstr ""
+
 #. Disable temporarily the apply button
 #. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
 #. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
 #. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: src/prefs.c:1429
+#: src/prefs.c:1438
 msgid "Apply changes (but don't save) and close this window"
 msgstr "套用變更 (但不儲存) 並關閉視窗"
 
-#: src/prefs.c:1438
+#: src/prefs.c:1447
 msgid "Close this window without saving"
 msgstr "不儲存關閉視窗"
 
-#: src/prefs.c:1446
+#: src/prefs.c:1455
 msgid "Save changes and close this window"
 msgstr "儲存變更並關閉視窗"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1479
+#: src/prefs.c:1488
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(例如: %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1632
+#: src/prefs.c:1644
 msgid "Changes applied"
 msgstr "變更已套用"
 
-#: src/prefs.c:1651 src/setting.c:877
+#: src/prefs.c:1663 src/setting.c:882
 msgid "Configuration saved"
 msgstr "設定已儲存"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1670
 msgid "Configuration unchanged"
 msgstr "設定未變更"
 
-#: src/prefs.c:1750
+#: src/prefs.c:1762
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4372,57 +4428,57 @@ msgstr ""
 "「%s」\n"
 "(%s) "
 
-#: src/prefs.c:1752
+#: src/prefs.c:1764
 msgid "Not a directory"
 msgstr "不是目錄"
 
-#: src/prefs.c:1868
+#: src/prefs.c:1880
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "找不到播放程式「%s」!"
 
-#: src/scan.c:179
+#: src/scan.c:180
 msgid "Fill Tag"
 msgstr "標籤填入"
 
-#: src/scan.c:180
+#: src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "檔案及目錄更名"
 
-#: src/scan.c:181
+#: src/scan.c:182
 msgid "Process Fields"
 msgstr "欄位處理"
 
-#: src/scan.c:364
+#: src/scan.c:365
 msgid "Tag successfully scanned..."
 msgstr "標籤已成功掃描..."
 
-#: src/scan.c:366
+#: src/scan.c:367
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "標籤已成功掃描...(%s)"
 
-#: src/scan.c:406
+#: src/scan.c:407
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr "標籤掃描: 真奇怪...找不到副檔名「%s」於檔名「%s」!"
 
-#: src/scan.c:488 src/scan.c:517
+#: src/scan.c:489 src/scan.c:518
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "掃描錯誤: 找不到分隔字元「%s」於「%s」"
 
-#: src/scan.c:674
+#: src/scan.c:675
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "無法轉換檔名「%s」為系統檔名編碼。"
 
-#: src/scan.c:704
+#: src/scan.c:705
 msgid "New file name successfully scanned..."
 msgstr "新檔名已成功掃描..."
 
-#: src/scan.c:707
+#: src/scan.c:708
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "新檔名已成功掃描...(%s)"
@@ -4430,41 +4486,41 @@ msgstr "新檔名已成功掃描...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:2303
+#: src/scan.c:2323
 msgid "Tag and File Name scan"
 msgstr "標籤及檔名掃描"
 
 #. Option Menu
-#: src/scan.c:2325
+#: src/scan.c:2345
 msgid "Scanner:"
 msgstr "掃描:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:2347
+#: src/scan.c:2367
 msgid "Select the type of scanner to use"
 msgstr "選擇要掃描的類型"
 
-#: src/scan.c:2356
+#: src/scan.c:2376
 msgid "Open scanner window / Scan selected files"
 msgstr "開啟掃描視窗╱掃描所選檔案"
 
-#: src/scan.c:2369
+#: src/scan.c:2389
 msgid "Scanner Options"
 msgstr "掃描選項"
 
-#: src/scan.c:2378
+#: src/scan.c:2398
 msgid "Show / Hide Masks Editor"
 msgstr "顯示╱隱藏遮罩條件編輯"
 
-#: src/scan.c:2388
+#: src/scan.c:2408
 msgid "Show / Hide Legend"
 msgstr "顯示╱隱藏說明"
 
-#: src/scan.c:2398
+#: src/scan.c:2418
 msgid "Close this window"
 msgstr "關閉視窗"
 
-#: src/scan.c:2426
+#: src/scan.c:2446
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4472,15 +4528,15 @@ msgstr ""
 "請選擇或輸入要解析檔名和路徑的遮罩條件代碼 (請見說明),用來填入標籤欄位。"
 
 #. Preview label
-#: src/scan.c:2452
+#: src/scan.c:2472
 msgid "Fill tag preview..."
 msgstr "標籤填入預覽..."
 
-#: src/scan.c:2479
+#: src/scan.c:2499
 msgid "Prefix mask with current path"
 msgstr "目前路徑的前置遮罩"
 
-#: src/scan.c:2492
+#: src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4491,141 +4547,151 @@ msgstr ""
 "使用 / 代表目錄,如果第一個字元為 / 代表絕對路徑,不然則為相對路徑。"
 
 #. Preview label
-#: src/scan.c:2519
+#: src/scan.c:2539
 msgid "Rename file preview..."
 msgstr "檔案更名預覽..."
 
-#: src/scan.c:2539
+#: src/scan.c:2559
 msgid "Select fields:"
 msgstr "選擇欄位:"
 
-#: src/scan.c:2542
+#: src/scan.c:2562
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
 msgstr "右邊的按鈕代表你可以處理的欄位,請選擇你想變更的欄位。"
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2545
+#: src/scan.c:2565
 msgid "F"
 msgstr "檔名"
 
-#: src/scan.c:2546
+#: src/scan.c:2566
 msgid "Process file name field"
 msgstr "處理檔名欄位"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2548
+#: src/scan.c:2568
 msgid "T"
 msgstr "曲名"
 
-#: src/scan.c:2549
+#: src/scan.c:2569
 msgid "Process title field"
 msgstr "處理曲名欄位"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2551
+#: src/scan.c:2571
 msgid "Ar"
 msgstr "歌手"
 
-#: src/scan.c:2552
+#: src/scan.c:2572
 msgid "Process file artist field"
 msgstr "處理演唱者欄位"
 
+#. Advice for Translators : set the first letter of album artist translated
+#: src/scan.c:2574
+msgid "AA"
+msgstr ""
+
+#: src/scan.c:2575
+#, fuzzy
+msgid "Process album artist field"
+msgstr "處理演唱者欄位"
+
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2554
+#: src/scan.c:2577
 msgid "Al"
 msgstr "專輯"
 
-#: src/scan.c:2555
+#: src/scan.c:2578
 msgid "Process album field"
 msgstr "處理專輯欄位"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2557
+#: src/scan.c:2580
 msgid "G"
 msgstr "曲風"
 
-#: src/scan.c:2558
+#: src/scan.c:2581
 msgid "Process genre field"
 msgstr "處理曲風欄位"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2560
+#: src/scan.c:2583
 msgid "Cm"
 msgstr "備註"
 
-#: src/scan.c:2561
+#: src/scan.c:2584
 msgid "Process comment field"
 msgstr "處理備註欄位"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2563
+#: src/scan.c:2586
 msgid "Cp"
 msgstr "作曲"
 
-#: src/scan.c:2564
+#: src/scan.c:2587
 msgid "Process composer field"
 msgstr "處理作曲者欄位"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2566
+#: src/scan.c:2589
 msgid "O"
 msgstr "原唱"
 
-#: src/scan.c:2567
+#: src/scan.c:2590
 msgid "Process original artist field"
 msgstr "處理原唱者欄位"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2569
+#: src/scan.c:2592
 msgid "Cr"
 msgstr "版權"
 
-#: src/scan.c:2570
+#: src/scan.c:2593
 msgid "Process copyright field"
 msgstr "處理版權所有者欄位"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2572
+#: src/scan.c:2595
 msgid "U"
 msgstr "網址"
 
-#: src/scan.c:2573
+#: src/scan.c:2596
 msgid "Process URL field"
 msgstr "處理網址欄位"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2575
+#: src/scan.c:2598
 msgid "E"
 msgstr "程式"
 
-#: src/scan.c:2576
+#: src/scan.c:2599
 msgid "Process encoder name field"
 msgstr "處理邊把程式欄位"
 
-#: src/scan.c:2622
+#: src/scan.c:2648
 msgid "Invert Selection"
 msgstr "反向選擇"
 
-#: src/scan.c:2631
+#: src/scan.c:2657
 msgid "Select/Unselect All."
 msgstr "全選╱全部不選"
 
 #. Group: character conversion
-#: src/scan.c:2638
+#: src/scan.c:2664
 msgid "Convert '_' and '%20' to ' '"
 msgstr "轉換「_」及「%20」為「 」"
 
-#: src/scan.c:2644
+#: src/scan.c:2670
 msgid "Convert:"
 msgstr "轉換: "
 
-#: src/scan.c:2646
+#: src/scan.c:2672
 msgid "to: "
 msgstr "為: "
 
-#: src/scan.c:2675
+#: src/scan.c:2701
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4633,36 +4699,36 @@ msgstr ""
 "將底線或「%20」字串取代成空格,例如:「Text%20In%20An_Entry」會變「Text In An "
 "Entry」。"
 
-#: src/scan.c:2678
+#: src/scan.c:2704
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr "將空格取代成底線,例如:「Text In An Entry」會變「Text_In_An_Entry」。"
 
-#: src/scan.c:2681
+#: src/scan.c:2707
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2694
+#: src/scan.c:2720
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: src/scan.c:2721
+#: src/scan.c:2747
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
 "轉換所有欄位的文字為大寫,例如:「Text IN AN entry」會變「TEXT IN AN ENTRY」。"
 
-#: src/scan.c:2724
+#: src/scan.c:2750
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
 "轉換所有欄位的文字為小寫,例如:「TEXT IN an entry」會變「text in an entry」。"
 
-#: src/scan.c:2727
+#: src/scan.c:2753
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4670,7 +4736,7 @@ msgstr ""
 "轉換所有欄位的第一個字母為大寫,例如:「text IN An ENTRY」會變「Text in an "
 "entry」。"
 
-#: src/scan.c:2730
+#: src/scan.c:2756
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4678,7 +4744,7 @@ msgstr ""
 "轉換所有欄位每個文字的第一個字母為大寫,例如:「Text in an ENTRY」會變「Text "
 "In An Entry」。"
 
-#: src/scan.c:2733
+#: src/scan.c:2759
 #, fuzzy
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
@@ -4686,29 +4752,29 @@ msgid ""
 msgstr ""
 "所有大寫字母前都插入空格,例如: 「TextInAnEntry」會變「Text In An Entry」。"
 
-#: src/scan.c:2742
+#: src/scan.c:2768
 msgid "Insert a space before an uppercase letter"
 msgstr "於大寫字母前插入空格"
 
-#: src/scan.c:2743
+#: src/scan.c:2769
 msgid "Remove duplicates of space or underscore"
 msgstr "移除重複的空格或底線"
 
-#: src/scan.c:2761
+#: src/scan.c:2787
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 "移除所有文字間的空格,例如: 「Text In An Entry」會變「TextInAnEntry」。"
 
-#: src/scan.c:2764
+#: src/scan.c:2790
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 "所有大寫字母前都插入空格,例如: 「TextInAnEntry」會變「Text In An Entry」。"
 
-#: src/scan.c:2767
+#: src/scan.c:2793
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4718,183 +4784,188 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2774
+#: src/scan.c:2800
 msgid "Legend"
 msgstr "說明"
 
-#: src/scan.c:2780
+#: src/scan.c:2806
 #, c-format
 msgid "%a : artist"
 msgstr "%a : 演唱者"
 
-#: src/scan.c:2783
+#: src/scan.c:2809
+#, fuzzy
+msgid "%z : album artist"
+msgstr "%a : 演唱者"
+
+#: src/scan.c:2812
 msgid "%b : album"
 msgstr "%b : 專輯"
 
-#: src/scan.c:2786
+#: src/scan.c:2815
 #, c-format
 msgid "%c : comment"
 msgstr "%c : 備註"
 
-#: src/scan.c:2789
+#: src/scan.c:2818
 #, c-format
 msgid "%p : composer"
 msgstr "%p : 作曲者"
 
-#: src/scan.c:2792
+#: src/scan.c:2821
 msgid "%r : copyright"
 msgstr "%r : 版權所有"
 
-#: src/scan.c:2795
+#: src/scan.c:2824
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : 光碟編號"
 
-#: src/scan.c:2798
+#: src/scan.c:2827
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : 編碼程式"
 
-#: src/scan.c:2801
+#: src/scan.c:2830
 #, c-format
 msgid "%g : genre"
 msgstr "%g : 曲風"
 
-#: src/scan.c:2804
+#: src/scan.c:2833
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : 已忽略"
 
-#: src/scan.c:2807
+#: src/scan.c:2836
 msgid "%l : number of tracks"
 msgstr "%l : 曲目總數"
 
-#: src/scan.c:2810
+#: src/scan.c:2839
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : 原唱者"
 
-#: src/scan.c:2813
+#: src/scan.c:2842
 #, c-format
 msgid "%n : track"
 msgstr "%n : 曲目編號"
 
-#: src/scan.c:2816
+#: src/scan.c:2845
 msgid "%t : title"
 msgstr "%t : 曲名"
 
-#: src/scan.c:2819
+#: src/scan.c:2848
 #, c-format
 msgid "%u : URL"
 msgstr "%u : 網址"
 
-#: src/scan.c:2822
+#: src/scan.c:2851
 msgid "%y : year"
 msgstr "%y : 發行年份"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2829
+#: src/scan.c:2858
 msgid "Mask Editor"
 msgstr "遮罩條件編輯"
 
-#: src/scan.c:2886
+#: src/scan.c:2915
 msgid "Create New Mask"
 msgstr "建立新遮罩"
 
-#: src/scan.c:2896
+#: src/scan.c:2925
 msgid "Move Up this Mask"
 msgstr "此遮罩向上移"
 
-#: src/scan.c:2906
+#: src/scan.c:2935
 msgid "Move Down this Mask"
 msgstr "此遮罩向下移"
 
-#: src/scan.c:2916
+#: src/scan.c:2945
 msgid "Duplicate Mask"
 msgstr "複製遮罩"
 
-#: src/scan.c:2926
+#: src/scan.c:2955
 msgid "Add Default Masks"
 msgstr "加入預設遮罩"
 
-#: src/scan.c:2936
+#: src/scan.c:2965
 msgid "Remove Mask"
 msgstr "移除遮罩"
 
-#: src/scan.c:2946
+#: src/scan.c:2975
 msgid "Save Masks"
 msgstr "儲存遮罩"
 
-#: src/scan.c:3532
+#: src/scan.c:3566
 msgid "New_mask"
 msgstr "新遮罩條件"
 
-#: src/scan.c:3570
+#: src/scan.c:3604
 msgid "Copy: No row selected!"
 msgstr "複製: 未選擇項目!"
 
-#: src/scan.c:3676
+#: src/scan.c:3710
 msgid "Remove: No row selected!"
 msgstr "移除: 未選擇項目!"
 
-#: src/scan.c:3723
+#: src/scan.c:3757
 msgid "Move Up: No row selected!"
 msgstr "向上移: 未選擇項目!"
 
-#: src/scan.c:3776
+#: src/scan.c:3810
 msgid "Move Down: No row selected!"
 msgstr "向下移: 未選擇項目!"
 
-#: src/setting.c:904
+#: src/setting.c:909
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "錯誤: 無法寫入組態檔案: %s (%s)"
 
-#: src/setting.c:1053 src/setting.c:1096
+#: src/setting.c:1058 src/setting.c:1101
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "無法開啟組態檔案「%s」(%s)"
 
-#: src/setting.c:1054
+#: src/setting.c:1059
 msgid "Loading default configuration..."
 msgstr "載入預設組態..."
 
-#: src/setting.c:1167 src/setting.c:1174 src/setting.c:1181 src/setting.c:1188
-#: src/setting.c:1195 src/setting.c:1202 src/setting.c:1209 src/setting.c:1216
-#: src/setting.c:1223 src/setting.c:1230 src/setting.c:1237 src/setting.c:1244
-#: src/setting.c:1251 src/setting.c:1258 src/setting.c:1265 src/setting.c:1272
-#: src/setting.c:1279
+#: src/setting.c:1172 src/setting.c:1179 src/setting.c:1186 src/setting.c:1193
+#: src/setting.c:1200 src/setting.c:1207 src/setting.c:1214 src/setting.c:1221
+#: src/setting.c:1228 src/setting.c:1235 src/setting.c:1242 src/setting.c:1249
+#: src/setting.c:1256 src/setting.c:1263 src/setting.c:1270 src/setting.c:1277
+#: src/setting.c:1284
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "無法建立或開啟檔案「%s」(%s)"
 
-#: src/setting.c:1318
+#: src/setting.c:1323
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "錯誤: 無法寫入檔案清單: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1406
+#: src/setting.c:1411
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "載入預設「標籤填入」遮罩..."
 
 #. Fall back to defaults
-#: src/setting.c:1434
+#: src/setting.c:1439
 msgid "Loading default 'Rename File' masks..."
 msgstr "載入預設「檔案更名」遮罩..."
 
 #. Fall back to defaults
-#: src/setting.c:1461
+#: src/setting.c:1466
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "載入預設「目錄更名」遮罩..."
 
-#: src/setting.c:1655
+#: src/setting.c:1660
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "錯誤: 環境變數 HOME 未定義!"
 
-#: src/setting.c:1676
+#: src/setting.c:1681
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "錯誤: 無法建立目錄「%s」(%s)!"
diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 0000000..b5093c7
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,824 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = easytag$(EXEEXT)
+subdir = src
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_easytag_OBJECTS = about.$(OBJEXT) ape_tag.$(OBJEXT) bar.$(OBJEXT) \
+	base64.$(OBJEXT) browser.$(OBJEXT) cddb.$(OBJEXT) \
+	charset.$(OBJEXT) crc32.$(OBJEXT) dlm.$(OBJEXT) \
+	easytag.$(OBJEXT) et_core.$(OBJEXT) flac_header.$(OBJEXT) \
+	flac_tag.$(OBJEXT) id3_tag.$(OBJEXT) id3v24_tag.$(OBJEXT) \
+	log.$(OBJEXT) misc.$(OBJEXT) monkeyaudio_header.$(OBJEXT) \
+	mpeg_header.$(OBJEXT) mp4_header.$(OBJEXT) mp4_tag.$(OBJEXT) \
+	musepack_header.$(OBJEXT) msgbox.$(OBJEXT) \
+	ogg_header.$(OBJEXT) ogg_tag.$(OBJEXT) picture.$(OBJEXT) \
+	prefs.$(OBJEXT) scan.$(OBJEXT) setting.$(OBJEXT) \
+	vcedit.$(OBJEXT) wavpack_header.$(OBJEXT) \
+	wavpack_tag.$(OBJEXT)
+easytag_OBJECTS = $(am_easytag_OBJECTS)
+am__DEPENDENCIES_1 =
+easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) libmpg123/libmpg123.a \
+	libapetag/libapetag.a id3lib/libid3bugfix.a
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(easytag_SOURCES)
+DIST_SOURCES = $(easytag_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@ @GTK_CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = libmpg123 libapetag id3lib
+easytag_SOURCES = \
+ about.c \
+ about.h \
+ ape_tag.c \
+ ape_tag.h \
+ bar.c \
+ bar.h \
+ base64.c \
+ base64.h \
+ browser.c \
+ browser.h \
+ cddb.c \
+ cddb.h \
+ charset.c \
+ charset.h \
+ crc32.c \
+ crc32.h \
+ dlm.c \
+ dlm.h \
+ easytag.c \
+ easytag.h \
+ et_core.c \
+ et_core.h \
+ flac_header.c \
+ flac_header.h \
+ flac_tag.c \
+ flac_tag.h \
+ genres.h \
+ id3_tag.c \
+ id3_tag.h \
+ id3v24_tag.c \
+ log.c \
+ log.h \
+ misc.c \
+ misc.h \
+ monkeyaudio_header.c \
+ monkeyaudio_header.h \
+ mpeg_header.c \
+ mpeg_header.h \
+ mp4_header.c \
+ mp4_header.h \
+ mp4_tag.c \
+ mp4_tag.h \
+ musepack_header.c \
+ musepack_header.h \
+ msgbox.c \
+ msgbox.h \
+ ogg_header.c \
+ ogg_header.h \
+ ogg_tag.c \
+ ogg_tag.h \
+ picture.c \
+ picture.h \
+ prefs.c \
+ prefs.h \
+ scan.c \
+ scan.h \
+ setting.c \
+ setting.h \
+ ui_manager.h \
+ vcedit.c \
+ vcedit.h \
+ wavpack_header.c \
+ wavpack_header.h \
+ wavpack_tag.c \
+ wavpack_tag.h
+
+EXTRA_DIST = \
+ Makefile.mingw \
+ win32/easytag.rc \
+ win32/gtkwin32dep.c \
+ win32/gtkwin32dep.h \
+ win32/resource.h \
+ win32/win32dep.c \
+ win32/win32dep.h \
+ win32/win_easytag.c \
+ win32/nsis/easytag-header.bmp \
+ win32/nsis/easytag-install.bmp \
+ win32/nsis/easytag-install.ico \
+ win32/nsis/easytag-uninstall.bmp 
+
+easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
+PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
+           -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
+
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+easytag$(EXEEXT): $(easytag_OBJECTS) $(easytag_DEPENDENCIES) 
+	@rm -f easytag$(EXEEXT)
+	$(LINK) $(easytag_OBJECTS) $(easytag_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/about.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ape_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bar.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/base64.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/browser.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cddb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/charset.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crc32.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dlm.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/easytag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/et_core.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flac_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flac_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/id3_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/id3v24_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/log.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/misc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/monkeyaudio_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpeg_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msgbox.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/musepack_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ogg_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ogg_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/picture.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prefs.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scan.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setting.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vcedit.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wavpack_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wavpack_tag.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/about.c b/src/about.c
index e57f31f..f21acda 100644
--- a/src/about.c
+++ b/src/about.c
@@ -180,6 +180,7 @@ void Show_About_Window (void)
             {"    - Jose Sun ",                     _("(Chinese (Taiwan) translation)")},
             {"    - Yuval Hager ",                  _("(Hebrew translation)")},
             {"    - Miloš Popović ",                _("(Serbian translation)")},
+            {"    - Götz Waschk ",                  _("(German translation)")},
             {NULL,NULL}
             };
 
@@ -226,6 +227,9 @@ void Show_About_Window (void)
             "    - Emmanuel Brun\n"
             "    - Maarten Maathuis\n"
             "    - Pierre Dumuid\n"
+            "    - Kip Warner\n"
+            "    - Mark Ferry\n"
+            "    - Gaute Amundsen\n"
             "";
 
     GtkWidget *ExtensionList;
diff --git a/src/browser.c b/src/browser.c
index ee154cf..310a781 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -744,7 +744,7 @@ gboolean Browser_Tree_Node_Selected (GtkTreeSelection *selection, gpointer user_
     Update_Command_Buttons_Sensivity(); // Not clean to put this here...
 
     /* Check if all files have been saved before changing the directory */
-    if (ET_Check_If_All_Files_Are_Saved() != TRUE)
+    if (CONFIRM_WHEN_UNSAVED_FILES && ET_Check_If_All_Files_Are_Saved() != TRUE)
     {
         GtkWidget *msgbox = NULL;
         gint response;
diff --git a/src/easytag.c b/src/easytag.c
index d312f23..5abd04d 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -4936,8 +4936,8 @@ void Quit_MainWindow (void)
     /* Save combobox history list before exit */
     Save_Path_Entry_List(BrowserEntryModel, MISC_COMBO_TEXT);
 
-    /* Exit ? */
-    if (ET_Check_If_All_Files_Are_Saved() != TRUE)
+    /* Check if all files have been saved before exit */
+    if (CONFIRM_WHEN_UNSAVED_FILES && ET_Check_If_All_Files_Are_Saved() != TRUE)
     {
         /* Some files haven't been saved */
         msgbox = msg_box_new(_("Confirm..."),
diff --git a/src/easytag.h b/src/easytag.h
index 742c702..a99f956 100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -31,7 +31,7 @@
 
 #define APPNAME            "EasyTAG"
 #define AUTHOR             "Jerome Couderc"    // Note: do not use accents
-#define EMAIL              "easytag at gmail.com"
+#define EMAIL              "easytag-mailing at lists.sourceforge.net"
 #define WEBPAGE            "http://easytag.sourceforge.net"
 /*#define VERSION "0.15.1" //Now version is defined in ../configure.h.in */
 
diff --git a/src/flac_tag.c b/src/flac_tag.c
index 19c4c48..3bdfd91 100644
--- a/src/flac_tag.c
+++ b/src/flac_tag.c
@@ -65,6 +65,7 @@
  *  - TITLE        : Track name
  *  - VERSION      : The version field may be used to differentiate multiple version of the same track title in a single collection. (e.g. remix info)
  *  - ALBUM        : The collection name to which this track belongs
+ *  - ALBUMARTIST  : Compilation Artist or overall artist of an album
  *  - TRACKNUMBER  : The track number of this piece if part of a specific larger collection or album
  *  - TRACKTOTAL   :
  *  - ARTIST       : Track performer
@@ -224,6 +225,34 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
                     }
                 }
 
+                /****************
+                 * Album Artist *
+                 ****************/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"ALBUMARTIST")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
+
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->album_artist==NULL)
+                                FileTag->album_artist = g_strdup(field_value);
+                            else
+                                FileTag->album_artist = g_strconcat(FileTag->album_artist,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
+
                 /*********
                  * Album *
                  *********/
@@ -594,6 +623,7 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
                     field = &vc->comments[i];
                     if ( strncasecmp((gchar *)field->entry,"TITLE=",       MIN(6,  field->length)) != 0
                       && strncasecmp((gchar *)field->entry,"ARTIST=",      MIN(7,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"ALBUMARTIST=", MIN(12, field->length)) != 0
                       && strncasecmp((gchar *)field->entry,"ALBUM=",       MIN(6,  field->length)) != 0
                       && strncasecmp((gchar *)field->entry,"DISCNUMBER=",  MIN(11, field->length)) != 0
                       && strncasecmp((gchar *)field->entry,"DATE=",        MIN(5,  field->length)) != 0
@@ -672,6 +702,7 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
      * (but it will be deleted when rewriting the tag) */
     if ( FileTag->title       == NULL
       && FileTag->artist      == NULL
+      && FileTag->album_artist == NULL
       && FileTag->album       == NULL
       && FileTag->disc_number == NULL
       && FileTag->year        == NULL
@@ -692,6 +723,7 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
         // unsaved to rewrite a flac tag.
         if ( FileTag->title       != NULL
           || FileTag->artist      != NULL
+          || FileTag->album_artist != NULL
           || FileTag->album       != NULL
           || FileTag->disc_number != NULL
           || FileTag->year        != NULL
@@ -909,6 +941,14 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
             Flac_Write_Delimetered_Tag(vc_block,"ARTIST=",FileTag->artist);
         }
 
+        /****************
+         * Album Artist *
+         ****************/
+        if ( FileTag->album_artist )
+        {
+            Flac_Write_Delimetered_Tag(vc_block,"ALBUMARTIST=",FileTag->album_artist);
+        }
+
         /*********
          * Album *
          *********/
diff --git a/src/id3lib/Makefile.in b/src/id3lib/Makefile.in
new file mode 100644
index 0000000..ad05dfd
--- /dev/null
+++ b/src/id3lib/Makefile.in
@@ -0,0 +1,516 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/id3lib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libid3bugfix_a_AR = $(AR) $(ARFLAGS)
+libid3bugfix_a_LIBADD =
+am_libid3bugfix_a_OBJECTS = c_wrapper.$(OBJEXT)
+libid3bugfix_a_OBJECTS = $(am_libid3bugfix_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libid3bugfix_a_SOURCES)
+DIST_SOURCES = $(libid3bugfix_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@ @GTK_CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LIBRARIES = libid3bugfix.a
+INCLUDES = -DLOCALE=\"$(localedir)\"
+EXTRA_DIST = \
+    patch_id3lib_3.8.3_UTF16_writing_bug.diff
+
+libid3bugfix_a_SOURCES = \
+    c_wrapper.cpp \
+    id3_bugfix.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/id3lib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/id3lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libid3bugfix.a: $(libid3bugfix_a_OBJECTS) $(libid3bugfix_a_DEPENDENCIES) 
+	-rm -f libid3bugfix.a
+	$(libid3bugfix_a_AR) libid3bugfix.a $(libid3bugfix_a_OBJECTS) $(libid3bugfix_a_LIBADD)
+	$(RANLIB) libid3bugfix.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/c_wrapper.Po at am__quote@
+
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/libapetag/Makefile.in b/src/libapetag/Makefile.in
new file mode 100644
index 0000000..1ba51f5
--- /dev/null
+++ b/src/libapetag/Makefile.in
@@ -0,0 +1,520 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/libapetag
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libapetag_a_AR = $(AR) $(ARFLAGS)
+libapetag_a_LIBADD =
+am_libapetag_a_OBJECTS = apetaglib.$(OBJEXT) is_tag.$(OBJEXT) \
+	info_mac.$(OBJEXT) info_mpc.$(OBJEXT)
+libapetag_a_OBJECTS = $(am_libapetag_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libapetag_a_SOURCES)
+DIST_SOURCES = $(libapetag_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@ @GTK_CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LIBRARIES = libapetag.a
+INCLUDES = -DLOCALE=\"$(localedir)\"
+libapetag_a_SOURCES = \
+    apetaglib.c \
+    apetaglib.h \
+    is_tag.c \
+    is_tag.h \
+    info_mac.c \
+    info_mac.h \
+    info_mpc.c \
+    info_mpc.h
+
+EXTRA_DIST = \
+    COPYING.LGPL \
+    README.apetag \
+    id3v2_read.c \
+    id3v2_read.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libapetag/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/libapetag/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libapetag.a: $(libapetag_a_OBJECTS) $(libapetag_a_DEPENDENCIES) 
+	-rm -f libapetag.a
+	$(libapetag_a_AR) libapetag.a $(libapetag_a_OBJECTS) $(libapetag_a_LIBADD)
+	$(RANLIB) libapetag.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/apetaglib.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/info_mac.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/info_mpc.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/is_tag.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/libmpg123/Makefile.in b/src/libmpg123/Makefile.in
new file mode 100644
index 0000000..44c3f93
--- /dev/null
+++ b/src/libmpg123/Makefile.in
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/libmpg123
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libmpg123_a_AR = $(AR) $(ARFLAGS)
+libmpg123_a_LIBADD =
+am_libmpg123_a_OBJECTS = common.$(OBJEXT) dxhead.$(OBJEXT) \
+	getbits.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) \
+	layer3.$(OBJEXT) mpg123.$(OBJEXT)
+libmpg123_a_OBJECTS = $(am_libmpg123_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libmpg123_a_SOURCES)
+DIST_SOURCES = $(libmpg123_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@ @GTK_CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LIBRARIES = libmpg123.a
+INCLUDES = -DLOCALE=\"$(localedir)\"
+libmpg123_a_SOURCES = \
+ common.c \
+ dxhead.h \
+ dxhead.c \
+ getbits.c \
+ getbits.h \
+ huffman.h \
+ l2tables.h \
+ layer1.c \
+ layer2.c \
+ layer3.c \
+ mpg123.c \
+ mpg123.h
+
+EXTRA_DIST = \
+ README
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libmpg123/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/libmpg123/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libmpg123.a: $(libmpg123_a_OBJECTS) $(libmpg123_a_DEPENDENCIES) 
+	-rm -f libmpg123.a
+	$(libmpg123_a_AR) libmpg123.a $(libmpg123_a_OBJECTS) $(libmpg123_a_LIBADD)
+	$(RANLIB) libmpg123.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/common.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dxhead.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getbits.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/layer1.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/layer2.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/layer3.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpg123.Po at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/ogg_tag.c b/src/ogg_tag.c
index 1fa12a2..826d661 100644
--- a/src/ogg_tag.c
+++ b/src/ogg_tag.c
@@ -66,6 +66,7 @@
  * ALBUM        : The collection name to which this track belongs
  * TRACKNUMBER  : The track number of this piece if part of a specific larger collection or album
  * ARTIST       : The artist generally considered responsible for the work. In popular music this is usually the performing band or singer. For classical music it would be the composer. For an audio book it would be the author of the original text.
+ * ALBUMARTIST  : The compilation artist or overall artist of an album
  * PERFORMER    : The artist(s) who performed the work. In classical music this would be the conductor, orchestra, soloists. In an audio book it would be the actor who did the reading. In popular music this is typically the same as the ARTIST and is omitted.
  * COPYRIGHT    : Copyright attribution, e.g., '2001 Nobody's Band' or '1999 Jack Moffitt'
  * LICENSE      : License information, eg, 'All Rights Reserved', 'Any Use Permitted', a URL to a license such as a Creative Commons license ("www.creativecommons.org/blahblah/license.html") or the EFF Open Audio License ('distributed under the terms of the Open Audio License. see http://www.eff.org/IP/Open_licenses/eff_oal.html for details'), etc.
@@ -240,6 +241,25 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
         g_free(string);
     }
 
+    /****************
+     * Album Artist *
+     ****************/
+    field_num = 0;
+    while ( (string = vorbis_comment_query(vc,"ALBUMARTIST",field_num++)) != NULL )
+    {
+        string = Try_To_Validate_Utf8_String(string);
+
+        if ( g_utf8_strlen(string, -1) > 0 )
+        {
+            if (FileTag->album_artist==NULL)
+                FileTag->album_artist = g_strdup(string);
+            else
+                FileTag->album_artist = g_strconcat(FileTag->album_artist,MULTIFIELD_SEPARATOR,string,NULL);
+        }
+
+        g_free(string);
+    }
+
     /*********
      * Album *
      *********/
@@ -535,6 +555,7 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     {
         if ( strncasecmp(vc->user_comments[i],"TITLE=",            6) != 0
           && strncasecmp(vc->user_comments[i],"ARTIST=",           7) != 0
+          && strncasecmp(vc->user_comments[i],"ALBUMARTIST=",     12) != 0
           && strncasecmp(vc->user_comments[i],"ALBUM=",            6) != 0
           && strncasecmp(vc->user_comments[i],"DISCNUMBER=",      11) != 0
           && strncasecmp(vc->user_comments[i],"DATE=",             5) != 0
@@ -683,6 +704,14 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
         Ogg_Write_Delimetered_Tag(vc,"ARTIST=",FileTag->artist);
     }
 
+    /****************
+     * Album Artist *
+     ****************/
+    if ( FileTag->album_artist )
+    {
+        Ogg_Write_Delimetered_Tag(vc,"ALBUMARTIST=",FileTag->album_artist);
+    }
+
     /*********
      * Album *
      *********/
diff --git a/src/prefs.c b/src/prefs.c
index 97ecc30..6bea8ee 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -1414,6 +1414,9 @@ void Open_OptionsWindow (void)
     gtk_box_pack_start(GTK_BOX(VBox),ConfirmWritePlayList,FALSE,FALSE,0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ConfirmWritePlayList),CONFIRM_WRITE_PLAYLIST);
 
+    ConfirmWhenUnsavedFiles = gtk_check_button_new_with_label(_("Confirm changing directory when there are unsaved changes"));
+    gtk_box_pack_start(GTK_BOX(VBox),ConfirmWhenUnsavedFiles,FALSE,FALSE,0);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ConfirmWhenUnsavedFiles),CONFIRM_WHEN_UNSAVED_FILES);
 
 
     /*
diff --git a/src/prefs.h b/src/prefs.h
index b190224..7e3f42e 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -168,7 +168,7 @@ GtkWidget *ConfirmWriteTag;
 GtkWidget *ConfirmRenameFile;
 GtkWidget *ConfirmDeleteFile;
 GtkWidget *ConfirmWritePlayList;
-
+GtkWidget *ConfirmWhenUnsavedFiles;
 
 
 /**************
diff --git a/src/setting.c b/src/setting.c
index 7955541..b252724 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -201,6 +201,7 @@ tConfigVariable Config_Variables[] =
     {"confirm_rename_file",                     CV_TYPE_BOOL,    &CONFIRM_RENAME_FILE                    },
     {"confirm_write_playlist",                  CV_TYPE_BOOL,    &CONFIRM_WRITE_PLAYLIST                 },
     {"confirm_delete_file",                     CV_TYPE_BOOL,    &CONFIRM_DELETE_FILE                    },
+    {"confirm_when_unsaved_files",              CV_TYPE_BOOL,    &CONFIRM_WHEN_UNSAVED_FILES             },
     {"process_filename_field",                  CV_TYPE_BOOL,    &PROCESS_FILENAME_FIELD                 },
     {"process_title_field",                     CV_TYPE_BOOL,    &PROCESS_TITLE_FIELD                    },
     {"process_artist_field",                    CV_TYPE_BOOL,    &PROCESS_ARTIST_FIELD                   },
@@ -792,6 +793,7 @@ void Apply_Changes_Of_Preferences_Window (void)
         CONFIRM_RENAME_FILE    = GTK_TOGGLE_BUTTON(ConfirmRenameFile)->active;
         CONFIRM_DELETE_FILE    = GTK_TOGGLE_BUTTON(ConfirmDeleteFile)->active;
         CONFIRM_WRITE_PLAYLIST = GTK_TOGGLE_BUTTON(ConfirmWritePlayList)->active;
+        CONFIRM_WHEN_UNSAVED_FILES = GTK_TOGGLE_BUTTON(ConfirmWhenUnsavedFiles)->active;
 
         /* Parameters and variables of Scanner Window are in "scan.c" file */
         /* Parameters and variables of Cddb Window are in "cddb.c" file */
diff --git a/src/setting.h b/src/setting.h
index a86b3e1..fb2e6f4 100644
--- a/src/setting.h
+++ b/src/setting.h
@@ -156,6 +156,7 @@ gint    CONFIRM_WRITE_TAG;
 gint    CONFIRM_RENAME_FILE;
 gint    CONFIRM_WRITE_PLAYLIST;
 gint    CONFIRM_DELETE_FILE;
+gint    CONFIRM_WHEN_UNSAVED_FILES;
 
 /* Scanner window */
 gint    PROCESS_FILENAME_FIELD;

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list